Request 4248 (accepted)

Overview

Request 4248 (accepted)

Update to version 2.7.1

Created by enzokiel over 6 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package home:enzokiel:...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

@@ -1,4 +1,49 @@
 -------------------------------------------------------------------
+Tue Jun 05 20:27:49 UTC 2018 - enzokiel@kabelmail.de
+
+- Update to version 2.7.1
+  + Encoder:Add LibVA based HW accelerated H.264 encoder
+    (Intel/Linux)
+  + Decoder:Fix last frames of video not retrieved from decoder
+  + Decoder:Implement hardware accelerated decoding of H.264 on
+    macOS
+  + Decoder:Fix keyframe-based navigation in field-encoded MPEG-2
+    video
+  + Demuxer:Fix crash in the Matroska demuxer with high bitrate
+    audio
+  + Demuxer:Fix too short duration reported for MKV and MP4 with
+    B-frames
+  + Demuxer:Fix PTS delay calculation in the Matroska demuxer
+  + Demuxer:Fix audio delay ignored by the Mp4 demuxer
+  + Muxer:Improve resilience of FFmpeg based muxers against decode
+    timestamps irregularities
+  + Muxer:Allow to force display aspect ratio in the configuration
+    of the MP4 muxer
+  + Muxer:Fix crash in the AVI muxer on switch to OpenDML
+  + Images:Add PNG export, fix wrong colors with some colorspaces
+  + Images:Add feature to export selection as JPEG images
+  + Editor:Fix AVI with H.264 / HEVC without B-frames being not
+    seekable
+  + Editor:Make AVI with H.264 / HEVC containing B-frames seekable
+    by decoding the entire video
+  + New Filter:Still Image: generate video of specified duration out
+    of a single image
+  + Filter:Make eq2 video filter partializable
+  + Filter:Implement fade-in / fade-out transition for "Add logo"
+  + UI:Display selection duration in the UI, move filter preview
+    toggle to the toolbar
+  + UI:Warn right away if an edit would result in cuts being not on
+    keyframes
+  + UI:Improve time chooser dialog
+  + Audio:Add Opus encoder
+  + Audio:Allow LPCM in FFmpeg-based muxers
+  + Audio:Show duration for external audio tracks
+  + Miscellaneous:Improved overall polish and stability
+- Removed avidemux-glibc-2.27.patch, fixed upstream.
+- Removed all qt4 stuff.
+- Added avidemux-backport_Fix_threads_setup.patch.
+
+-------------------------------------------------------------------
 Sat Apr 07 14:05:21 UTC 2018 - enzokiel@kabelmail.de
 
 - Added avidemux-glibc-2.27.patch to Fix compilation with

avidemux3.spec Changed

@@ -16,27 +16,14 @@
 #
 
 
-%if 0%{?suse_version} > 1320 || 0%{?sle_version}
-%bcond_without build_qt5
-%define qtversion 5
-%else
-%bcond_with build_qt5
-%define qtversion 4
-%endif
-
-%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120100
-%bcond_without with_vs
-%endif
-
 Name: avidemux3
 Summary: Graphical video editing and transcoding tool
-Version: 2.7.0
+Version: 2.7.1
 Release: 1
 Url: http://avidemux.sourceforge.net/
 ExclusiveArch: %ix86 x86_64
 Source0: avidemux_%{version}.tar.gz
-Source1: avidemux3-qt.desktop
-Source2: avidemux3-vsproxy-qt.desktop
+Source1: avidemux3.desktop
 Source3: config.mak.diff
 Patch0: avidemux-cmake-2.8.8.patch
 Patch1: avidemux-linking.patch
@@ -46,7 +33,7 @@
 Patch5: avidemux-bootStrap.patch
 Patch6: avidemux-cmake-permissions.patch
 Patch7: avidemux-cpu_armel.patch
-Patch8: avidemux-glibc-2.27.patch
+Patch8: avidemux-backport_Fix_threads_setup.patch
 License: GPL-2.0
 Group: Productivity/Multimedia/Video/Editors and Convertors
 
@@ -59,10 +46,8 @@
 BuildRequires: fdupes
 BuildRequires: dos2unix
 BuildRequires: yasm
-%if %{with with_vs}
 BuildRequires: pkgconfig(vapoursynth)
 BuildRequires: pkgconfig(vapoursynth-script)
-%endif
 BuildRequires: pkgconfig(fribidi)
 BuildRequires: pkgconfig(libxslt)
 BuildRequires: pkgconfig(libxml-2.0)
@@ -109,20 +94,15 @@
 BuildRequires: pkgconfig(x264)
 BuildRequires: pkgconfig(x265)
 
-%if %{with build_qt5}
-# QT5-GUI
+# GUI
 BuildRequires: cmake(Qt5Core)
 BuildRequires: cmake(Qt5LinguistTools)
 BuildRequires: cmake(Qt5Network)
 BuildRequires: cmake(Qt5OpenGL)
 BuildRequires: cmake(Qt5Script)
 BuildRequires: cmake(Qt5Widgets)
-%else
-# QT4-GUI
-BuildRequires: pkgconfig(QtCore) >= 4.7
-%endif
 
-# Main package requires at least one frontend (cli or qt4)
+# Main package requires at least one frontend (cli or qt5)
 Requires: avidemux3-frontend = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
@@ -156,14 +136,14 @@
 
 This package provides a command-line interface to editing videos with avidemux.
 
-%package qt%{qtversion}
+%package qt5
 Summary: Qt interface for avidemux
 Group: Productivity/Multimedia/Video/Editors and Convertors
 Provides: avidemux3-frontend = %{version}-%{release}
 Requires: avidemux3 = %{version}-%{release}
-Recommends: avidemux3-qt%{qtversion}-lang = %{version}-%{release}
+Recommends: avidemux3-qt5-lang = %{version}-%{release}
 
-%description qt%{qtversion}
+%description qt5
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
@@ -176,13 +156,13 @@
 
 This package contains the Qt graphical interface for avidemux.
 
-%package qt%{qtversion}-lang
-Summary: Languages for package avidemux3-qt%{qtversion}
+%package qt5-lang
+Summary: Languages for package avidemux3-qt5
 Group: System/Localization
-Requires: avidemux3-qt%{qtversion} = %{version}-%{release}
+Requires: avidemux3-qt5 = %{version}-%{release}
 BuildArch: noarch
 
-%description qt%{qtversion}-lang
+%description qt5-lang
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
@@ -193,7 +173,7 @@
 from other people and projects has been used as well. Patches, translations
 and even bug reports are always welcome.
 
-This package provides translations for package avidemux3-qt%{qtversion}.
+This package provides translations for package avidemux3-qt5.
 
 
 %prep
@@ -209,40 +189,24 @@
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
-%if 0%{?suse_version} > 1500
-%patch8 -p0
-%endif
+%patch8 -p0 -R
 cp -f %{S:3} avidemux_core/ffmpeg_package/patches/
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
 %build
 flags+="%optflags -fno-strict-aliasing "
-%if 0%{?suse_version} == 1320
-%ifarch %ix86
-flags+="-fno-stack-protector "
-%endif
-%endif
 export CXXFLAGS="$flags"
 
 options+="--with-cli "
-%if %{with build_qt5}
 options+="--with-qt "
-%else
-options+="--with-qt --enable-qt4 "
-%endif
 ./bootStrap.bash $options
 
 %install
 cp -r install/* %{buildroot}
 
 # Install desktop file
-install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
-sed -i -e 's|qtversion|%{qtversion}|g' %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
-%if %{with with_vs}
-install -D -m644 %{S:2} %{buildroot}%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop
-sed -i -e 's|qtversion|%{qtversion}|g' %{buildroot}%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop
-%endif
+install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3.desktop
 
 # Install icon
 install -D -m644 avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux3.png
@@ -263,19 +227,16 @@
 
 %postun cli -p /sbin/ldconfig
 
-%post qt%{qtversion}
+%post qt5
 /sbin/ldconfig
 %desktop_database_post
 
-%postun qt%{qtversion}
+%postun qt5
 /sbin/ldconfig
 %desktop_database_postun
 
 %files
 %defattr(-,root,root)
-%if %{with with_vs}
-%{_bindir}/vsProxy
-%endif
 %{_libdir}/libADM6avcodec.so.*
 %{_libdir}/libADM6avformat.so.*
 %{_libdir}/libADM6avutil.so.*
@@ -293,6 +254,7 @@
 %{_libdir}/libADM_coreImageLoader6.so
 %{_libdir}/libADM_coreJobs.so
 %{_libdir}/libADM_coreLibVA6.so
+%{_libdir}/libADM_coreLibVAEnc6.so
 %{_libdir}/libADM_coreMuxer6.so
 %{_libdir}/libADM_coreScript.so
 %{_libdir}/libADM_coreSocket6.so
@@ -344,6 +306,7 @@
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_ac3.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so
+%{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_opus.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_pcm.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_twolame.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
@@ -387,8 +350,8 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_huff.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_null.so
-%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_png.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so
@@ -420,18 +383,15 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotate.so
-%if 0%{?suse_version} <= 1500
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ssa.so
-%endif
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_separateField.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_stackField.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_stillimage.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swapUV.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
-%if %{with build_qt5}
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
-%endif
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
@@ -462,54 +422,48 @@
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
 
-%files qt%{qtversion}
+%files qt5
 %defattr(-,root,root)
-%{_bindir}/avidemux3_jobs_qt%{qtversion}
-%{_bindir}/avidemux3_qt%{qtversion}
-%if %{with with_vs}
-%{_bindir}/vsProxy_gui_qt%{qtversion}
-%endif
-%{_libdir}/libADM_openGLQT%{qtversion}6.so
-%{_libdir}/libADM_render6_QT%{qtversion}.so
-%{_libdir}/libADM_UIQT%{qtversion}6.so
+%{_bindir}/avidemux3_jobs_qt5
+%{_bindir}/avidemux3_qt5
+%{_libdir}/libADM_openGLQT56.so
+%{_libdir}/libADM_render6_QT5.so
+%{_libdir}/libADM_UIQT56.so
 %dir %{_libdir}/ADM_plugins6/shaderDemo
 %dir %{_libdir}/ADM_plugins6/shaderDemo/1
-%dir %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}
-%dir %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}
+%dir %{_libdir}/ADM_plugins6/videoEncoders/qt5
+%dir %{_libdir}/ADM_plugins6/videoFilters/qt5
 %{_libdir}/ADM_plugins6/shaderDemo/1/bump.shader
 %{_libdir}/ADM_plugins6/shaderDemo/1/lightning.shader
 %{_libdir}/ADM_plugins6/shaderDemo/1/ripple.shader
 %{_libdir}/ADM_plugins6/shaderDemo/1/zigzag.shader
-%{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x264_QT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x265_QT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_asharpQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_blackenBordersQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_chromaShiftQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_contrastQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_cropQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_eq2QT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glBenchmark.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glResize.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_HueQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_logoQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_mpdelogoQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_msharpenQT%{qtversion}.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_rotateGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlVertex.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_shaderLoaderGl.so
-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_swscaleResizeQT%{qtversion}.so
-%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
-%if %{with with_vs}
-%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop
-%endif
+%{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.so
+%{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blackenBordersQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_chromaShiftQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_contrastQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_cropQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_eq2QT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glBenchmark.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glResize.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_logoQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_mpdelogoQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_msharpenQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_rotateGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlVertex.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_shaderLoaderGl.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_swscaleResizeQT5.so
+%{_datadir}/applications/avidemux3.desktop
 %{_datadir}/pixmaps/avidemux3.png
 
-%files qt%{qtversion}-lang
+%files qt5-lang
 %defattr(-,root,root)
 %dir %{_datadir}/avidemux3
-%dir %{_datadir}/avidemux3/qt%{qtversion}
-%dir %{_datadir}/avidemux3/qt%{qtversion}/i18n
-%{_datadir}/avidemux3/qt%{qtversion}/i18n/*.qm
+%dir %{_datadir}/avidemux3/qt5
+%dir %{_datadir}/avidemux3/qt5/i18n
+%{_datadir}/avidemux3/qt5/i18n/*.qm
 
 %changelog

avidemux-backport_Fix_threads_setup.patch Added

avidemux-glibc-2.27.patch Deleted

avidemux3-vsproxy-qt.desktop Deleted

avidemux3-qt.desktop -> avidemux3.desktop Changed

avidemux_2.7.0.tar.gz/addons/avisynthproxy/vc90.idb Deleted

avidemux_2.7.0.tar.gz/addons/avisynthproxy/vc90.pdb Deleted

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_timeStamp.cpp Deleted

@@ -1,180 +0,0 @@
-/***************************************************************************
- FAC_toggle.cpp
- Handle dialog factory element : Toggle
- (C) 2006 Mean Fixounet@free.fr 
-***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-
-#include <QGridLayout>
-#include <QLabel>
-#include <QProgressBar>
-#include <QSpinBox>
-
-
-
-#include "ADM_default.h"
-#include "DIA_factory.h"
-#include "ADM_dialogFactoryQt4.h"
-#include "ADM_vidMisc.h"
-
-extern const char *shortkey(const char *);
-/**
- * \struct myTimeWidget
- */
-typedef struct
-{
- QSpinBox *hours;
- QSpinBox *minutes;
- QSpinBox *seconds;
- QSpinBox *mseconds;
-}myTimeWidget;
-
-namespace ADM_Qt4Factory
-{
-/**
- * \class diaElemTimeStamp
- * \brief Qt4 version of diaElemTimeStamp
- */
-class diaElemTimeStamp : public diaElem,QtFactoryUtils
-{
- protected :
- uint32_t valueMin;
- uint32_t valueMax;
-public:
- 
- diaElemTimeStamp(uint32_t *v,const char *toggleTitle,const uint32_t vmin, const uint32_t vmax);
- virtual ~diaElemTimeStamp() ;
- void setMe(void *dialog, void *opaque,uint32_t line);
- void getMe(void);
- int getRequiredLayout(void);
-};
-
-/**
- * \fn diaElemTimeStamp
- * @param percent
- * @param toggleTitle
- */
-diaElemTimeStamp::diaElemTimeStamp(uint32_t *v,const char *toggleTitle,const uint32_t vmin, const uint32_t vmax)
- : diaElem(ELEM_TIMESTAMP),QtFactoryUtils(toggleTitle)
-{
- param=v;
- valueMin=vmin;
- valueMax=vmax;
- }
-/**
- * \fn diaElemTimeStamp
- * \brief dtor
- */
-diaElemTimeStamp::~diaElemTimeStamp()
-{
- myTimeWidget *w=(myTimeWidget *)myWidget;
- myWidget=NULL;
- if(w) delete w;
-}
-/**
- * \fn setMe
- * \brief construct UI to display editable timestamp
- * @param dialog
- * @param opaque
- * @param line
- */
-void diaElemTimeStamp::setMe(void *dialog, void *opaque,uint32_t line)
-{
- myTimeWidget *myTWidget = new myTimeWidget;
- myTWidget->hours=new QSpinBox((QWidget *)dialog);
- myTWidget->minutes=new QSpinBox((QWidget *)dialog);
- myTWidget->seconds=new QSpinBox((QWidget *)dialog);
- myTWidget->mseconds=new QSpinBox((QWidget *)dialog);
- myWidget=(void *)myTWidget; 
- 
- myTWidget->minutes->setRange(0,59);
- myTWidget->seconds->setRange(0,59);
- myTWidget->mseconds->setRange(0,999);
- 
- QLabel *textSemiColumn=new QLabel( "h:");
- QLabel *textSemiColumn2=new QLabel( "m:");
- QLabel *textComma=new QLabel( "s,");
- 
- QGridLayout *layout=(QGridLayout*) opaque;
- QHBoxLayout *hboxLayout = new QHBoxLayout();
- 
- uint32_t ms=*(uint32_t *)param;
- // split time in ms into hh/mm/ss
- uint32_t hh,mm,ss,msec;
- ms2time(ms,&hh,&mm,&ss,&msec);
- myTWidget->hours->setValue(hh);
- myTWidget->minutes->setValue(mm);
- myTWidget->seconds->setValue(ss);
- myTWidget->mseconds->setValue(msec);
- 
- QLabel *text=new QLabel(myQtTitle,(QWidget *)dialog);
- text->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- text->setBuddy(myTWidget->hours);
-
- QSpacerItem *spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
- hboxLayout->addWidget(myTWidget->hours);
- hboxLayout->addWidget(textSemiColumn);
- 
- hboxLayout->addWidget(myTWidget->minutes);
- hboxLayout->addWidget(textSemiColumn2);
- 
- hboxLayout->addWidget(myTWidget->seconds);
- hboxLayout->addWidget(textComma);
- hboxLayout->addWidget(myTWidget->mseconds);
- 
- hboxLayout->addItem(spacer);
-
- layout->addWidget(text,line,0);
- layout->addLayout(hboxLayout,line,1);
- 
-}
-/**
- * \fn getMe
- * \brief retrieve value from UI
- */
-void diaElemTimeStamp::getMe(void)
-{
- uint32_t val;
- myTimeWidget *widget=(myTimeWidget *)myWidget;
- uint32_t hh=widget->hours->value();
- uint32_t mm=widget->minutes->value();
- uint32_t ss=widget->seconds->value();
- uint32_t ms=widget->mseconds->value();
- 
- uint32_t valueInMs;
- valueInMs=hh*3600*1000+mm*60*1000+ss*1000+ms;
- *(uint32_t *)param=valueInMs;
- 
-}
-
-int diaElemTimeStamp::getRequiredLayout(void) { return FAC_QT_GRIDLAYOUT; }
-} // nameapsce
-/**
- * \fn qt4CreateTimeStamp
- * @param v
- * @param toggleTitle
- * @param vmin
- * @param vmax
- * @return 
- */
-diaElem *qt4CreateTimeStamp(uint32_t *v,const char *toggleTitle,const uint32_t vmin, const uint32_t vmax)
-{
-	return new ADM_Qt4Factory::diaElemTimeStamp(v,toggleTitle,vmin,vmax);
-}
-void qt4DestroyTimeStamp(diaElem *e)
-{
-	ADM_Qt4Factory::diaElemTimeStamp *a=(ADM_Qt4Factory::diaElemTimeStamp *)e;
-	delete a;
-}
-//
-//EOF

avidemux_2.7.0.tar.gz/avidemux/winInstaller/createNsis32Qt5.sh Deleted

avidemux_2.7.0.tar.gz/avidemux/winInstaller/createNsis64Qt5.sh Deleted

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp Deleted

@@ -1,285 +0,0 @@
-//------------------------------------
-/**
- * \fn ctor
- * @param context
- * @param bufferSize
- */
-ADM_vaEncodingBuffer::ADM_vaEncodingBuffer(ADM_vaEncodingContext *context,int bufferSize)
-{
- int xError;
- CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display,context->contextId,VAEncCodedBufferType,
- bufferSize, 1, NULL, &bufferId));
- if(xError)
- {
- ADM_warning("Cannot create encoding buffer\n");
- bufferId=VA_INVALID;
- } 
-}
-/**
- * \fn dtor
- */
-ADM_vaEncodingBuffer::~ADM_vaEncodingBuffer()
-{
- if(bufferId!=VA_INVALID)
- {
- vaDestroyBuffer(ADM_coreLibVA::display,bufferId);
- bufferId=VA_INVALID;
- } 
-}
-
-/**
- * \fn readBuffers
- * @param bufferId
- * @param maxSize
- * @param to
- * @param sizeOut
- * @return 
- */
-bool ADM_vaEncodingBuffer::readBuffers(int maxSize, uint8_t *to, uint32_t *sizeOut)
-{
- int xError;
- CHECK_WORKING(false);
- VACodedBufferSegment *buf_list = NULL; 
- 
- *sizeOut=0;
- if(bufferId==VA_INVALID)
- {
- ADM_warning("Using invalid encoding buffer\n");
- return false;
- }
- CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display,bufferId,(void **)(&buf_list)));
- if(xError)
- {
- ADM_warning("Cannot read buffer\n");
- return false;
- }
- while (buf_list) 
- {
- if(*sizeOut+buf_list->size>maxSize)
- {
- ADM_warning("Overflow\n");
- ADM_assert(0);
- }
- int round=buf_list->size;
- memcpy(to, buf_list->buf, round);
- to+=round;
- *sizeOut+=round;
- buf_list = (VACodedBufferSegment *)buf_list->next;
- }
- CHECK_ERROR(vaUnmapBuffer(ADM_coreLibVA::display,bufferId));
- return true;
-}
-/**
- * \fn ctor
- */
-ADM_vaEncodingContext::ADM_vaEncodingContext()
-{
- contextId=VA_INVALID;
- internalSurface[0]=NULL;
- internalSurface[1]=NULL;
- extraData=NULL;
- firstPic=false;
-}
-/**
- * \fn dtor
- */
-
-ADM_vaEncodingContext::~ADM_vaEncodingContext()
-{
- int xError;
- CHECK_WORKING();
- if(contextId!=VA_INVALID)
- {
- CHECK_ERROR(vaDestroyContext(ADM_coreLibVA::display,contextId));
- contextId=VA_INVALID;
- }
- for(int i=0;i<2;i++)
- if(internalSurface[i])
- {
- delete internalSurface[i];
- internalSurface[i]=NULL;
- }
- if(extraData) 
- {
- delete [] extraData;
- extraData=NULL;
- }
-}
-/**
- * \fn createExtraData
- * @return 
- */
-bool ADM_vaEncodingContext::createExtraData()
-{
- int xError;
- CHECK_WORKING(false);
-#if 0 
- VAEncSequenceParameterBufferH264 seq_h264 = {0};
- VABufferID seq_param_buf;
- 
- seq_h264.level_idc = 30;
- seq_h264.picture_width_in_mbs = width16/16;
- seq_h264.picture_height_in_mbs = width16/16;
- seq_h264.bits_per_second = 8000000; // bps
- seq_h264.frame_rate = 30; // fps
- seq_h264.initial_qp = 20;
- seq_h264.min_qp = 1;
- seq_h264.basic_unit_size = 0;
- seq_h264.intra_period = 50;
-
- CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display, contextId,
- VAEncSequenceParameterBufferType,
- sizeof(seq_h264),1,&seq_h264,&seq_param_buf));
- if(xError) return false;
- CHECK_ERROR (vaRenderPicture(ADM_coreLibVA::display, contextId, &seq_param_buf, 1));
- if(xError) return false;
- return true;
-#else
- return false;
-#endif 
-}
-/**
- * \fn encode
- * @param src
- * @param out
- * @param encodingBuffer
- * @return 
- */
-bool ADM_vaEncodingContext::encode(ADM_vaSurface *src, ADMBitstream *out,ADM_vaEncodingBuffer *encodingBuffer)
-{
-#if 0
- int xError;
-
- CHECK_WORKING(false);
-
- CHECK_ERROR(vaBeginPicture(ADM_coreLibVA::display, contextId, src->surface));
- if(xError) return false;
-
- if(firstPic)
- {
- firstPic=false;
- if(!createExtraData())
- {
- ADM_warning("Cannot create SPS\n");
- return false;
- }
- }
- VAEncPictureParameterBufferH264 pic_h264;
- VABufferID pic_param_buf;
- VAEncSliceParameterBuffer slice_h264;
- VABufferID slice_param_buf;
-#if 0
- pic_h264.reference_picture = internalSurface[toggle]->surface;
- pic_h264.reconstructed_picture= internalSurface[1^toggle]->surface;
- pic_h264.coded_buf = encodingBuffer->bufferId;
-
- pic_h264.picture_width = width16;
- pic_h264.picture_height = height16;
- pic_h264.last_picture = 0; // FIXME
-#endif 
- CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display, contextId,VAEncPictureParameterBufferType,
- sizeof(pic_h264),1,&pic_h264,&pic_param_buf));
- if(xError) return false;
- 
-
- CHECK_ERROR(vaRenderPicture(ADM_coreLibVA::display, contextId, &pic_param_buf, 1));
- if(xError) return false;
- 
- slice_h264.start_row_number = 0;
- slice_h264.slice_height = height16/16; /* Measured by MB */
- slice_h264.slice_flags.bits.is_intra = 1;
- slice_h264.slice_flags.bits.disable_deblocking_filter_idc = 0;
- CHECK_ERROR(vaCreateBuffer(ADM_coreLibVA::display, contextId,VAEncSliceParameterBufferType,
- sizeof(slice_h264),1,&slice_h264,&slice_param_buf));
- if(xError) return false;
- 
- CHECK_ERROR(vaRenderPicture(ADM_coreLibVA::display, contextId, &slice_param_buf, 1));
- if(xError) return false;
- 
- CHECK_ERROR(vaEndPicture(ADM_coreLibVA::display, contextId));
- if(xError) return false;
-
- CHECK_ERROR(vaSyncSurface(ADM_coreLibVA::display, src->surface));
- if(xError) return false;
- VASurfaceStatus surface_status ;
- CHECK_ERROR(vaQuerySurfaceStatus(ADM_coreLibVA::display, src->surface,&surface_status));
- if(xError) return false;
- 
- //frame_skipped = (surface_status & VASurfaceSkipped);
-
- //save_coded_buf(coded_buf[codedbuf_idx], i, frame_skipped);
- bool r=encodingBuffer->readBuffers(out->bufferSize,out->data,&(out->len));
- if(!r)
- {
- ADM_warning("Cannot read buffer\n");
- return false;
- }
- out->dts=ADM_NO_PTS;
- out->pts=ADM_NO_PTS;
- out->flags=AVI_KEY_FRAME;
-#endif
- return true; 
-}
-
-
-/**
- * \fn init
- * @param width
- * @param height
- * @param surfaceCount
- * @param surfaces
- * @return 
- */
- bool ADM_vaEncodingContext::init(int width, int height, int surfaceCount, ADM_vaSurface **surfaces)
- {
- int xError;
- CHECK_WORKING(false);
- if(false==ADM_coreLibVAEnc::encoders::vaH264.enabled)
- {
- ADM_warning("H264 encoding not supported\n");
- return false;
- }
- for(int i=0;i<surfaceCount;i++)
- if(!surfaces[i]->hasValidSurface())
- {
- ADM_warning("Surface %d is invalid\n",i);
- return false;
- }
- 
- 
- width16=(width+15)&~15;
- height16=(height+15)&~15;
- 
- internalSurface[0]=ADM_vaSurface::allocateWithSurface(width16,height16);
- internalSurface[1]=ADM_vaSurface::allocateWithSurface(width16,height16);
-
- if(!internalSurface[0] || !internalSurface[1])
- {
- ADM_warning("Cannot allocate internal images\n");
- return false;
- }
-
-
- 
- VASurfaceID *s=new VASurfaceID[surfaceCount+2];
- for(int i=0;i<surfaceCount;i++)
- s[i]=surfaces[i]->surface;
- s[surfaceCount]=internalSurface[0]->surface;
- s[surfaceCount+1]=internalSurface[1]->surface;
- CHECK_ERROR(vaCreateContext(ADM_coreLibVA::display, 
- ADM_coreLibVAEnc::encoders::vaH264.configId,
- width16, height16,
- VA_PROGRESSIVE,
- s,
- surfaceCount+2,&contextId));
- delete [] s;
- if(xError)
- {
- ADM_warning("Cannot create encoding context\n");
- return false;
- }
- aprintf("Context created ok\n");
- return true;
- }
-// EOF
- 
\ No newline at end of file

avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.3.2.tar.bz2 Deleted

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc Deleted

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp Deleted

@@ -1,259 +0,0 @@
-/***************************************************************************
- \fn ADM_ffNvEnc
- \brief Front end for libavcodec Mpeg4 asp encoder
- -------------------
-
- copyright : (C) 2002/2009 by mean
- email : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#include "ADM_default.h"
-#include "ADM_ffVaEnc.h"
-#undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
-#include "DIA_factory.h"
-
-#define USE_VA_SURFACE 
-
-#ifdef USE_VA_SURFACE
- #define MY_PÏXFMT AV_PIX_FMT_VAAPI
-#else
- #define MY_PÏXFMT AV_PIX_FMT_YUV420P
-#endif
-
-
-#if 0
-#define aprintf(...) {}
-#else
-#define aprintf printf
-#endif
-
-extern "C"
-{
- #include "libavutil/opt.h"
-}
-
-ffvaenc_encoder VaEncSettings = VAENC_CONF_DEFAULT;
-
-/**
- \fn ADM_ffVaEncEncoder
-*/
-ADM_ffVaEncEncoder::ADM_ffVaEncEncoder(ADM_coreVideoFilter *src,bool globalHeader) : ADM_coreVideoEncoderFFmpeg(src,NULL,globalHeader)
-{
- //targetColorSpace=ADM_COLOR_YUV422P;
- ADM_info("[ffNvEncEncoder] Creating.\n");
- frameContext=NULL;
- deviceContext=NULL;
-}
-
-/**
- \fn ~ADM_ffVaEncEncoder
-*/
-ADM_ffVaEncEncoder::~ADM_ffVaEncEncoder()
-{
- ADM_info("[vaEncoder] Destroying.\n");
- if(frameContext)
- {
- av_buffer_unref(&frameContext);
- }
- if(deviceContext)
- {
- av_buffer_unref(&deviceContext);
- }
-}
-/**
- \fn pre-open
-*/
-bool ADM_ffVaEncEncoder::configureContext(void)
-{
- ADM_info("ConfigureContext\n");
- _context->bit_rate = VaEncSettings.bitrate*1000;
- _context->rc_max_rate= VaEncSettings.max_bitrate*1000;
- _context->pix_fmt = MY_PÏXFMT; 
- 
- // allocate device context
- deviceContext=av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
- if(!deviceContext)
- {
- ADM_warning("Cannot allocate device context\n");
- return false;
- }
- // setup device context
- AVHWDeviceContext *devContext=(AVHWDeviceContext *)deviceContext->data;
- AVVAAPIDeviceContext *vaContext=(AVVAAPIDeviceContext *)devContext->hwctx;
- 
- vaContext->display=admLibVA::getVADisplay(); // if we get here VA is operationnal
- 
- int er=av_hwdevice_ctx_init(deviceContext);
- if(er)
- {
- ADM_warning("Cannot setup vaapi hw encoder (er=%d)\n",er);
- return false;
- }
- 
- // Now setup the frame context..
- 
- frameContext=av_hwframe_ctx_alloc(deviceContext);
- if(!frameContext)
- {
- ADM_warning("Cannot allocate frameContext\n");
- return false;
- }
- AVHWFramesContext *c=(AVHWFramesContext *)(frameContext->data);
- c->format=MY_PÏXFMT;
- c->sw_format=AV_PIX_FMT_YUV420P;
- c->width=(getWidth()+15)&~15;
- c->height=(getHeight()+15)&~15;;
- 
- for(int i=0;i<VAENC_NB_SURFACES;i++)
- {
- ADM_vaSurface *surface=new ADM_vaSurface(c->width,c->height); // roundup ??
- surface->surface= admLibVA::allocateSurface(c->width,c->height);
- freeSurface.pushBack(surface);
- }
- c->initial_pool_size=VAENC_NB_SURFACES;
- 
- 
- er=av_hwframe_ctx_init(frameContext);
- if(er)
- {
- ADM_warning("Cannot setup vaapi hw frame (er=%d)\n",er);
- return false;
- }
- 
- _context->hw_frames_ctx=frameContext;
- 
- int w= getWidth();
- int h= getHeight();
- 
- w=(w+15)&~15;
- h=(h+15)&~15;
- 
- 
- 
- 
- ADM_info("configureContext ok\n");
- return true; 
-}
-
-/**
- \fn setup
-*/
-bool ADM_ffVaEncEncoder::setup(void)
-{
- ADM_info("setup\n");
- if(false== ADM_coreVideoEncoderFFmpeg::setupByName("h264_vaapi"))
- {
- ADM_info("[vaEncoder] Setup failed\n");
- return false;
- }
-
- ADM_info("[vaEncoder] Setup ok\n");
- 
- 
- return true;
-}
-
-
-
-/**
- \fn encode
-*/
-bool ADM_ffVaEncEncoder::encode (ADMBitstream * out)
-{
-int sz,q;
-ADM_vaSurface *s;
-again:
- sz=0;
- if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
- {
- sz=encodeWrapper(NULL,out);
- if (sz<= 0)
- {
- ADM_info("[vaEncoder] Error %d encoding video\n",sz);
- return false;
- }
- ADM_info("[vaEncoder] Popping delayed bframes (%d)\n",sz);
- goto link;
- return false;
- }
- q=image->_Qp;
-
- if(!q) q=2;
- aprintf("[CODEC] Flags = 0x%x, QSCALE=%x, bit_rate=%d, quality=%d qz=%d incoming qz=%d\n",_context->flags,CODEC_FLAG_QSCALE,
- _context->bit_rate, _frame->quality, _frame->quality/ FF_QP2LAMBDA,q);
-#if defined(USE_VA_SURFACE)
- s=freeSurface.pop();
- printf("Surface=%d\n",s->surface);
- if(!s->fromAdmImage(image))
- {
- ADM_warning("Cannot upload to surface\n");
- freeSurface.pushBack(s);
- return false;
- }
- inUseSurface.pushBack(s);
- _frame->data[0]=_frame->data[1]=_frame->data[2]=NULL;
- _frame->data[3]=(uint8_t *)s->surface;
- 
-#endif 
- _frame->reordered_opaque=image->Pts;
- _frame->width=image->GetWidth(PLANAR_Y);
- _frame->height=image->GetHeight(PLANAR_Y); 
- _frame->format= MY_PÏXFMT;
- sz=encodeWrapper(_frame,out);
- 
- if(sz<0)
- {
- ADM_warning("[vaEncoder] Error %d encoding video\n",sz);
- return false;
- }
-
- if(sz==0) // no pic, probably pre filling, try again
- goto again;
-link:
- return postEncode(out,sz);
-}
-
-/**
- \fn isDualPass
-
-*/
-bool ADM_ffVaEncEncoder::isDualPass(void)
-{ 
- return false;
-}
-
-/**
- \fn jpegConfigure
- \brief UI configuration for jpeg encoder
-*/
-
-bool ffVaEncConfigure(void)
-{
-
- ffvaenc_encoder *conf=&VaEncSettings;
-
-#define PX(x) &(conf->x)
-
- 
- diaElemUInteger bitrate(PX(bitrate),QT_TRANSLATE_NOOP("vaenc","Bitrate (kbps):"),1,50000);
- diaElemUInteger maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("vaenc","Max Bitrate (kbps):"),1,50000);
- /* First Tab : encoding mode */
- diaElem *diamode[]={&bitrate,&maxBitrate};
-
- if( diaFactoryRun(QT_TRANSLATE_NOOP("vaenc","VAAPI H264 Encoder"),2,diamode))
- {
- 
- return true;
- }
- return false;
-}
-// EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.h Deleted

@@ -1,68 +0,0 @@
-/***************************************************************************
- \fn ADM_VideoEncoders
- \brief Internal handling of video encoders
- -------------------
-
- copyright : (C) 2002/2009 by mean
- email : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-#pragma once
-#include "ADM_ptrQueue.h"
-#include "ADM_coreVideoEncoderFFmpeg.h"
-#include "ADM_coreLibVA/ADM_coreLibVA.h"
-#include "ffVaEnc.h"
-extern "C" 
-{
-#include "libavutil/hwcontext.h"
-#include "libavutil/hwcontext_vaapi.h"
-}
-
-
-
-
-
-#define VAENC_CONF_DEFAULT \
-{ \
-		0, \
- 10000, \
- 20000,\
-	}
-
-
-
-/**
- \class ADM_ffVaEncEncoder
- \brief Dummy encoder that does nothing
-
-*/
-class ADM_ffVaEncEncoder : public ADM_coreVideoEncoderFFmpeg
-{
-#define VAENC_NB_SURFACES 16
-protected:
- AVBufferRef *frameContext;
- AVBufferRef *deviceContext;
- ADM_ptrQueue<ADM_vaSurface >freeSurface;
- ADM_ptrQueue<ADM_vaSurface >inUseSurface;
- 
-public:
-
- ADM_ffVaEncEncoder(ADM_coreVideoFilter *src,bool globalHeader);
-virtual ~ADM_ffVaEncEncoder();
-virtual bool configureContext(void);
-virtual bool setup(void);
-virtual bool encode (ADMBitstream * out);
-virtual const char *getFourcc(void) {return "H264";}
-
-virtual bool isDualPass(void) ;
-
-};
-

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEncPlugin.cpp Deleted

@@ -1,93 +0,0 @@
-/***************************************************************************
-                          \fn     nvEnc
-                          \brief  Plugin for nvEnc lav encoder
-                             -------------------
-
-    copyright            : (C) 2002/2016 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ADM_default.h"
-#include "ADM_ffVaEnc.h"
-#include "ADM_coreVideoEncoderInternal.h"
-#include "ffVaEnc_desc.cpp"
-extern bool            ffVaEncConfigure(void);
-extern ffvaenc_encoder VaEncSettings;
-
-void resetConfigurationData()
-{
-	ffvaenc_encoder defaultConf = VAENC_CONF_DEFAULT;
-
-	memcpy(&VaEncSettings, &defaultConf, sizeof(FFcodecSettings));
-}
-
-
-/**
- *  \fn nvCheckDll
- */
-
-static bool nvCheckDll(const char *zwin64, const char *zwin32, const char *zlinux)
-{
-        const char *dll;
-#ifdef _WIN32
-        #ifdef _WIN64
-            dll=zwin64;
-        #else
-            dll=zwin32;
-        #endif
-#else
-        dll=zlinux;
-#endif
-        
-        ADM_LibWrapper wrapper;
-        bool r=wrapper.loadLibrary(dll);
-        ADM_info("\t checking %s-> %d\n",dll,r);
-        return r;
-}
-/**
- * \fn nvEncProbe
- */
-extern "C"
-{
-    static bool vaEncProbe(void)
-    {
-#if 0
-        // Step 1 : Try to load cuda
-        if(!nvCheckDll("nvcuda.dll","nvcuda.dll","libcuda.so"))
-        {
-            ADM_warning("Cannot load cuda dll\n");
-            return false;
-        }
-        // Step 2 : Try to load encoder
-
-        if(!nvCheckDll("nvEncodeAPI64.dll","nvEncodeAPI.dll","libnvidia-encode.so.1"))
-        {
-            ADM_warning("Cannot load nvidia encode dll\n");
-            return false;
-        }
-#endif        
-        return true;
-    }
-
-}
-
-ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffVaEncEncoder);
-ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffVaEnc",
-                               "Intel H264",
-                               "Intel hw encoder",
-                                ffVaEncConfigure, // No configuration
-                                ADM_UI_ALL,
-                                1,0,0,
-                                ffvaenc_encoder_param, // conf template
-                                &VaEncSettings,NULL,NULL, // conf var
-                                vaEncProbe
-);

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/CMakeLists.txt Deleted

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.conf Deleted

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.h Deleted

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_desc.cpp Deleted

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_json.cpp Deleted

avidemux_2.7.0.tar.gz/cmake/admCheckFridibi.cmake Deleted

@@ -1,36 +0,0 @@
-include(admCheckFontConfig)
-MACRO(checkFridibi minVersion)
-########################################
-# FRIDIBI
-########################################
-OPTION(FRIDIBI "" ON)
-checkFontConfig()
-MESSAGE(STATUS "Checking for Fridibi (want ${minVersion})")
-MESSAGE(STATUS "**************************************")
-
-IF(HAVE_FONTCONFIG)
-
-        IF (FRIDIBI)
-	        PKG_CHECK_MODULES(FRIDIBI fribidi)
-	        PRINT_LIBRARY_INFO("Fribidi" FRIDIBI_FOUND "${FRIDIBI_CFLAGS}" "${FRIDIBI_LDFLAGS}")
-	        IF (FRIDIBI_FOUND)
-		        # Warning does not work if we ask 0.19 and get 0.20
-		        MESSAGE(STATUS "Fridibi version ${FRIDIBI_VERSION}")
-		        IF("${FRIDIBI_VERSION}" MATCHES "${minVersion}.*")
-			        SET(USE_FRIDIBI 1)
-		        ELSE("${FRIDIBI_VERSION}" MATCHES "${minVersion}.*")
-			        MESSAGE(STATUS "Your version of cmake is too old, we need  ${minVersion}.*")
-		        ENDIF("${FRIDIBI_VERSION}" MATCHES "${minVersion}.*")
-	        ENDIF (FRIDIBI_FOUND)
-        ELSE (FRIDIBI)
-	        MESSAGE("${MSG_DISABLE_OPTION}")
-        ENDIF (FRIDIBI)
-ELSE(HAVE_FONTCONFIG)
-        MESSAGE(STATUS "No fontconfig=> no fribidi....")
-ENDIF(HAVE_FONTCONFIG)
-
-APPEND_SUMMARY_LIST("Miscellaneous" "FRIBIDI" "${FRIDIBI_FOUND}")
-
-MESSAGE("")
-
-ENDMACRO(checkFridibi)

avidemux_2.7.0.tar.gz/cmake/admWin32.rc.in Deleted

@@ -1,31 +0,0 @@
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION     ${FILEVERSION}
- PRODUCTVERSION  ${PRODUCTVERSION}
- FILEFLAGSMASK   0x3fL
- FILEFLAGS       0x0L
- FILEOS          0x4L
- FILETYPE        0x1L
- FILESUBTYPE     0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName",      "Free Software Foundation"
-            VALUE "FileDescription",  "Avidemux ${PRODUCTVERSION_STRING}"
-            VALUE "FileVersion",      "${FILEVERSION_STRING}"
-            VALUE "InternalName",     "avidemux"
-            VALUE "LegalCopyright",   "Copyright © 2001-2011 Free Software Foundation"
-            VALUE "OriginalFilename", ""
-            VALUE "ProductName",      "Avidemux"
-            VALUE "ProductVersion",   "${PRODUCTVERSION_STRING}"
-        END
-    END
-
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-100 ICON "${AVIDEMUX_TOP_SOURCE_DIR}/avidemux/common/xpm/${AVIDEMUX_ICON}"
\ No newline at end of file

avidemux_2.7.0.tar.gz/addons/avisynthproxy/avsproxy.cpp -> avidemux_2.7.1.tar.gz/addons/avisynthproxy/avsproxy.cpp Changed

avidemux_2.7.1.tar.gz/addons/avisynthproxy/avsproxy.exe Added

avidemux_2.7.0.tar.gz/addons/avisynthproxy/avsproxy.sln -> avidemux_2.7.1.tar.gz/addons/avisynthproxy/avsproxy.sln Changed

avidemux_2.7.0.tar.gz/addons/avisynthproxy/proxytype.h -> avidemux_2.7.1.tar.gz/addons/avisynthproxy/proxytype.h Changed

avidemux_2.7.0.tar.gz/addons/avsfilter/avspipecomm.cpp -> avidemux_2.7.1.tar.gz/addons/avsfilter/avspipecomm.cpp Changed

@@ -15,9 +15,9 @@
 * *
 ***************************************************************************/
 
-#ifdef OS_LINUX
+#ifndef __MINGW32__
 #include <unistd.h>
-#include "avi_vars.h" // only for uint32_t !!!
+#include <stdint.h> // only for uint32_t !!!
 #else
 #include <io.h>
 #include <windows.h>
@@ -56,28 +56,38 @@
 return true;
 }
 
-#define p(X) pp##X(int h, void *data, int sz)\
-{\
- int copy_sz = 0;\
- while (copy_sz != sz)\
- {\
- int isz = X(h, (char*)data + copy_sz,\
- ((sz - copy_sz) < PIPE_MAX_TRANSFER_SZ ? (sz - copy_sz) : PIPE_MAX_TRANSFER_SZ));\
- if (isz == -1 || isz == 0) return -1;\
- copy_sz += isz;\
- }\
- return copy_sz;\
+int ppread(int h, void *data, int sz)
+{
+ int copy_sz = 0;
+ while (copy_sz != sz)
+ {
+ int isz = read(h, (char*)data + copy_sz,
+ ((sz - copy_sz) < PIPE_MAX_TRANSFER_SZ ? (sz - copy_sz) : PIPE_MAX_TRANSFER_SZ));
+ if (isz == -1 || isz == 0) return -1;
+ copy_sz += isz;
+ }
+ return copy_sz;
 }
 
-int p(write);
-int p(read);
+int ppwrite(int h, void *data, int sz)
+{
+ int copy_sz = 0;
+ while (copy_sz != sz)
+ {
+ int isz = write(h, (char*)data + copy_sz,
+ ((sz - copy_sz) < PIPE_MAX_TRANSFER_SZ ? (sz - copy_sz) : PIPE_MAX_TRANSFER_SZ));
+ if (isz == -1 || isz == 0) return -1;
+ copy_sz += isz;
+ }
+ return copy_sz;
+}
 
 bool send_cmd(int hw, AVS_CMD cmd,
- void *data, int sz)
+ const void *data, int sz)
 {
 PIPE_MSG_HEADER msg = {cmd, sz};
 return ((ppwrite(hw, &msg, sizeof(msg)) == sizeof(msg)) &&
- (ppwrite(hw, data, sz) == sz));
+ (ppwrite(hw, (void*)data, sz) == sz));
 }
 
 bool send_cmd_with_specified_size(int hw, AVS_CMD cmd,

avidemux_2.7.0.tar.gz/addons/avsfilter/avspipecomm.h -> avidemux_2.7.1.tar.gz/addons/avsfilter/avspipecomm.h Changed

@@ -15,21 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef OS_LINUX
+#ifdef __MINGW32__
 #define uint32_t DWORD
-
-typedef struct
- {
-   uint32_t width;
-   uint32_t height;
-   uint32_t nb_frames;
-   uint32_t encoding;
-   uint32_t codec;
-   uint32_t fps1000;
-   uint32_t orgFrame;
-}ADV_Info;
-
 #endif
+
 typedef enum
 {
   LOAD_AVS_SCRIPT = 1,
@@ -47,6 +36,17 @@
 
 typedef struct
 {
+   uint32_t width;
+   uint32_t height;
+   uint32_t nb_frames;
+   uint32_t encoding;
+   uint32_t codec;
+   uint32_t fps1000;
+   uint32_t orgFrame;
+} ADV_Info;
+
+typedef struct
+{
   AVS_CMD avs_cmd;
   int sz;
 } PIPE_MSG_HEADER;
@@ -57,6 +57,7 @@
  PUT_FRAME - frame and frame_data[] set to corresponding value
  */
 typedef struct 
+
 {
   uint32_t frame;
   unsigned char frame_data[0];
@@ -70,7 +71,7 @@
 }PITCH_DATA;
 
 bool send_cmd(int hw, AVS_CMD cmd,
-              void *data, int sz);
+              const void *data, int sz);
 
 bool send_cmd_by_two_part(int hw, AVS_CMD cmd,
                           void *data1, int sz1,
@@ -87,7 +88,7 @@
 bool receive_data_by_size(int hr, void *data, int size);
 
 int ppread(int h, void *data, int sz);
-int ppwrite(int h, const void *data, int sz);
+int ppwrite(int h, void *data, int sz);
 
 #define PIPE_MAX_TRANSFER_SZ 65536/2
 #define MAGIC_ADV_PROTOCOL_VAL 0xADBACEED

avidemux_2.7.0.tar.gz/addons/avsfilter/winetmppath.cpp -> avidemux_2.7.1.tar.gz/addons/avsfilter/winetmppath.cpp Changed

avidemux_2.7.0.tar.gz/addons/mkvscan/CMakeLists.txt -> avidemux_2.7.1.tar.gz/addons/mkvscan/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/appImage/deploy.sh -> avidemux_2.7.1.tar.gz/appImage/deploy.sh Changed

@@ -69,7 +69,7 @@
 
 cp -Rap -t ../lib/qt5/plugins ${QT_HOME}/plugins/platforms  || fail qtplugins
 # Support libs
-for i in libffi.so.5  libsqlite3.so.0 libpng12.so.0 libgobject-2.0.so.0 libgthread-2.0.so.0 
+for i in libffi.so.6  libsqlite3.so.0 libpng12.so.0 libgobject-2.0.so.0 libgthread-2.0.so.0 
 do
         cpyX86 $i
 done
@@ -77,7 +77,7 @@
 cp -t ../lib /lib/x86_64-linux-gnu/libpcre.so.3 || fail pcre
 cp -t ../lib /lib/x86_64-linux-gnu/libglib-2.0.so.0 || fail glib
 cp -t ../lib /lib/x86_64-linux-gnu/libjson.so.0 || fail json
-cpyRootx86Lib libudev.so.0
+cpyRootx86Lib libudev.so.1
 
 # audio plugins
 for i in libfaad.so.2 libfaac.so.0 libmp3lame.so.0 libvorbis.so.0 libvorbisenc.so.2 libaften.so.0 libogg.so.0
@@ -85,13 +85,13 @@
         cpyX86 $i
 done
 
-cpyLib libopus.so.0 
+cpyX86 libopus.so.0 
 # Audio device
 cpyX86 libpulse-simple.so.0
 cpyX86 libpulse.so.0
 cpyX86 libfdk-aac.so.0
 cp -Rap /usr/lib/x86_64-linux-gnu/pulseaudio ../lib/ || fail pulsecommon_folder
-cp -t ../lib /usr/lib/x86_64-linux-gnu/pulseaudio/libpulsecommon-2.0.so || fail pulsecommon
+cp -t ../lib /usr/lib/x86_64-linux-gnu/pulseaudio/libpulsecommon-5.0.so || fail pulsecommon
  
 # subtitles
 for i in libfreetype.so.6 libfribidi.so.0 libfontconfig.so.1 
@@ -100,18 +100,18 @@
 done
 cpyRootx86Lib libexpat.so.1
 # x264
-cpyLib libx264.so.148
-cpyLib libx265.so.79
+cpyLib libx264.so.152
+cpyLib libx265.so.146
 # Display lib
 cpyX86 libvdpau.so.1
 cpyX86 libXv.so.1
-cpyLib libva.so.1
-cpyLib libva-x11.so.1
+cpyX86 libva.so.1
+cpyX86 libva-x11.so.1
 
-cp -t ../lib /usr/lib/dri/nvidia_drv_video.so || fail nvidia_drv_video
-cp -t ../lib /usr/lib/dri/i965_drv_video.so  || fail intel_drv_video
+cp -t ../lib /usr/lib/x86_64-linux-gnu/dri/nvidia_drv_video.so || fail nvidia_drv_video
+cp -t ../lib /usr/lib/x86_64-linux-gnu/dri/i965_drv_video.so  || fail intel_drv_video
 # patch
-sed -i -e 's|/usr/lib/dri|././/././lib|g'   ../lib/libva.so.1
+sed -i -e 's|/usr/lib/x86_64-linux-gnu/dri|././/././lib|g'   ../lib/libva.so.1
 sed -i -e 's|/usr/lib/x86_64-linux-gnu/dri|././././././/./././././/./lib|g'  ../lib/libva.so.1
 
 #intel, not sure it works

avidemux_2.7.0.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp -> avidemux_2.7.1.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/cli/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux/cli/CMakeLists.txt Changed

avidemux_2.7.1.tar.gz/avidemux/cli/admWin32.rc.in Added

avidemux_2.7.0.tar.gz/avidemux/common/ADM_audioFilter/src/audio_encoderPlugin.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_audioFilter/src/audio_encoderPlugin.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp Changed

@@ -27,6 +27,9 @@
 #else
 #define aprintf printf
 #endif
+
+static int _held; // we need to restore the original value of _hold on rewind
+
 /**
 * 
 * @param in
@@ -55,7 +58,7 @@
 _startTimeUs=_ms2us(startInMs);
 _shiftUs=_ms2us(shiftMs);
 
- _hold=0;
+ _held=_hold=0;
 rewind();
 
 ADM_info("[Bridge] Starting with time %s , shift %" PRIi32" ms\n",ADM_us2plain(startInMs*1000LL),-shiftMs);
@@ -83,8 +86,8 @@
 dNbSample/=1000000.;
 dNbSample*=_wavHeader.channels;
 _hold=(int32_t)dNbSample;
+ _held=_hold;
 }
- 
 }
 ADM_info("[Bridge] Ending with time %s, sample %u\n",ADM_us2plain(_startTimeUs),_hold);
 rewind();
@@ -105,6 +108,7 @@
 ADM_info("[AudioBridge] Going to time %s\n",ADM_us2plain(_startTimeUs));
 uint8_t r= _incoming->goToTime(_startTimeUs);
 if(!r) ADM_warning("[AudioBridge] Failed!\n");
+ _hold=_held;
 return r;
 }
 /**
@@ -147,7 +151,7 @@
 // Hysteresis
 if((_tail-_head)<(AUD_PROCESS_BUFFER_SIZE>>2)) // Less than 1/4 full
 {
-
+ int ratelimit=0;
 while (( _tail < (3*AUD_PROCESS_BUFFER_SIZE)/5)) // Fill up to 3/5--3/4
 {
 // don't ask too much front.
@@ -158,6 +162,10 @@
 got=0;
 dts=ADM_NO_PTS;
 }
+ // silence the audio before the specified delay is over
+ if(got && _hold>0)
+ memset(_incomingBuffer.at(_tail),0,got*_wavHeader.channels*sizeof(float));
+
 uint64_t endDts=dts+got*sampleToUs;
 aprintf("StartTime : %s\n",ADM_us2plain(_startTimeUs));
 aprintf("packet start : %s\n",ADM_us2plain(dts));
@@ -165,10 +173,19 @@
 
 if(dts!=ADM_NO_PTS && endDts < _startTimeUs)
 {
- ADM_info("Packet too early, dropping it... :%s",ADM_us2plain(dts));
- ADM_info("\n start is at :%s\n",ADM_us2plain(_startTimeUs));
+ if(ratelimit<8)
+ {
+ printf("[fillIncomingBuffer] Packet too early, dropping it... :%s",ADM_us2plain(dts));
+ printf("\n start is at :%s\n",ADM_us2plain(_startTimeUs));
+ }
+ ratelimit++;
 continue;
 }
+ if(ratelimit>=8)
+ {
+ ADM_info("%d consecutive 'packet too early' messages suppressed.\n",ratelimit-7);
+ ratelimit=0;
+ }
 got*=_wavHeader.channels; // sample->float
 if (!got )
 {

avidemux_2.7.0.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_commonUI/DIA_gototime.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_commonUI/DIA_gototime.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp Changed

@@ -44,8 +44,6 @@
 {
 uint32_t olddevice,newdevice;
 
-bool     use_odml=0;
-uint32_t autosplit=0;
 uint32_t render;
 
 bool     useSwap=0;
@@ -65,6 +63,7 @@
 
 bool     balternate_mp3_tag=true;
 bool     lastReadDirAsTarget=false;
+bool     copyModeSanitizeDts=false;
 bool     altKeyboardShortcuts=false;
 bool     swapUpDown=false;
 
@@ -75,6 +74,7 @@
 bool     bvdpau=false;
 bool     bxvba=false;
 bool     blibva=false;
+bool     bvideotoolbox=false;
 bool     hzd,vzd,dring;
 bool     capsMMX,capsMMXEXT,caps3DNOW,caps3DNOWEXT,capsSSE,capsSSE2,capsSSE3,capsSSSE3,capsAll;
 bool     hasOpenGl=false;
@@ -150,6 +150,10 @@
         prefs->get(FEATURES_XVBA,&bxvba);
         // libva
         prefs->get(FEATURES_LIBVA,&blibva);
+        // VideoToolbox
+#ifdef USE_VIDEOTOOLBOX
+        prefs->get(FEATURES_VIDEOTOOLBOX,&bvideotoolbox);
+#endif
         // Alternate mp3 tag (haali)
         prefs->get(FEATURES_ALTERNATE_MP3_TAG,&balternate_mp3_tag);
 
@@ -168,6 +172,11 @@
         // Make users happy who prefer the output dir to be the same as the input dir
         prefs->get(FEATURES_USE_LAST_READ_DIR_AS_TARGET,&lastReadDirAsTarget);
 
+        // Some muxers may bail with irregular DTS and some devices may fail to play such videos.
+        // Don't let DTS get too close to each other by delaying frames, drop frames if necessary.
+        // This results in more videos that can't be saved in copy mode.
+        prefs->get(FEATURES_COPY_MODE_SANITIZE_DTS,&copyModeSanitizeDts);
+
         // PgUp and PgDown are cumbersome to reach on some laptops, offer alternative kbd shortcuts
         prefs->get(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,&altKeyboardShortcuts);
 
@@ -188,13 +197,6 @@
         if(!prefs->get(PRIORITY_PLAYBACK, &playbackPriority))
         playbackPriority=0;
 
-        // VCD/SVCD split point
-        if(!prefs->get(MPEGSPLIT_AUTOSPLIT, &autosplit))
-                autosplit=690;
-
-        // Open DML (Gmv)
-        if(!prefs->get(FEATURES_USE_ODML, &use_odml))
-          use_odml=0;
 #if defined(ALSA_SUPPORT) || defined (OSS_SUPPORT)
 		// Master or PCM for audio
         if(!prefs->get(FEATURES_AUDIOBAR_USES_MASTER, &useMaster))
@@ -218,14 +220,15 @@
         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"));
-
-        bool foo=0;
-        diaElemToggle hwAccelText(&foo,QT_TRANSLATE_NOOP("adm","If you use Hw decoding, it is better to use the matching display driver"));
-
+#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
 
         diaElemToggle allowAnyMpeg(&mpeg_no_limit,QT_TRANSLATE_NOOP("adm","_Accept non-standard audio frequency for DVD"));
-        diaElemToggle openDml(&use_odml,QT_TRANSLATE_NOOP("adm","Create _OpenDML files"));
         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"));
         diaElemToggle swapUpDownKeys(&swapUpDown,QT_TRANSLATE_NOOP("adm","Re_verse UP and DOWN arrow keys for navigation"));
@@ -284,11 +287,9 @@
         framePriority.swallow(&menuIndexPriority);
         framePriority.swallow(&menuPlaybackPriority);
 
-        diaElemUInteger autoSplit(&autosplit,QT_TRANSLATE_NOOP("adm","_Split MPEG files every (MB):"),10,4096);
-
-        diaElemToggle   togTagMp3(&balternate_mp3_tag,QT_TRANSLATE_NOOP("adm","_Use alternative tag for MP3 in .mp4"));
-
+        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"));
 
         diaMenuEntry videoMode[]={
                              {RENDER_GTK, getNativeRendererDesc(0), NULL}
@@ -439,8 +440,8 @@
 
 
         /* Output */
-        diaElem *diaOutput[]={&autoSplit,&openDml,&allowAnyMpeg,&togTagMp3,&useLastReadAsTarget};
-        diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),5,(diaElem **)diaOutput);
+        diaElem *diaOutput[]={&allowAnyMpeg,&togTagMp3,&sanitizeDtsInCopyMode,&useLastReadAsTarget};
+        diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),4,(diaElem **)diaOutput);
 
         /* Audio */
 
@@ -479,8 +480,13 @@
 #endif
         diaElemTabs tabVideo(QT_TRANSLATE_NOOP("adm","Display"),sizeof(diaVideo)/sizeof(diaElem *),(diaElem **)diaVideo);
         /* HW accel */
+#ifdef 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);
+#endif
 
         /* CPU tab */
         diaElem *diaCpu[]={&frameSimd};
@@ -505,24 +511,25 @@
        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),8,tabs);
 
 // Now we can disable stuff if needed
-  
-#ifndef USE_DXVA2
-       useDxva2.enable(false);       
+#ifndef USE_VIDEOTOOLBOX
+    #ifndef USE_DXVA2
+       useDxva2.enable(false);
+    #endif
+    #ifndef USE_VDPAU
+        useVdpau.enable(false);
+    #endif
+    #ifndef USE_XVBA
+        useXvba.enable(false);
+    #endif
+    #ifndef USE_LIBVA
+        useLibVA.enable(false);
+    #endif
 #endif
 
-#ifndef USE_VDPAU       
-        useVdpau.enable(false);              
-#endif
-#ifndef USE_XVBA
-        useXvba.enable(false);              
-#endif
-#ifndef USE_LIBVA
-        useLibVA.enable(false);              
-#endif
-      
-#ifndef  USE_OPENGL
+#ifndef USE_OPENGL
         useOpenGl.enable(false);
 #endif
+
         if( diaFactoryRunTabsFinish(factoryCookiez))
 	{
         	//
@@ -594,10 +601,6 @@
             prefs->set(UPDATE_ENABLED,doAutoUpdate);
             // Video render
             prefs->set(VIDEODEVICE,render);
-            // Odml
-            prefs->set(FEATURES_USE_ODML, use_odml);
-                            // Split
-            prefs->set(MPEGSPLIT_AUTOSPLIT, autosplit);
 
             // number of threads
             prefs->set(FEATURES_THREADING_LAVC, lavcThreads);
@@ -623,10 +626,16 @@
             prefs->set(FEATURES_XVBA,bxvba);
             // LIBVA
             prefs->set(FEATURES_LIBVA,blibva);
+            // VideoToolbox
+#ifdef USE_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.
+            prefs->set(FEATURES_COPY_MODE_SANITIZE_DTS,copyModeSanitizeDts);
             // Enable alternate keyboard shortcuts
             prefs->set(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,altKeyboardShortcuts);
             // Allow to use the UP key to navigate back, DOWN to navigate forward

avidemux_2.7.0.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h Changed

@@ -37,7 +37,9 @@
 {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},
@@ -89,6 +91,7 @@
 {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}
 };
 
 std::vector<MenuEntry> myMenuVideo(_myMenuVideo, _myMenuVideo + sizeof(_myMenuVideo) / sizeof(_myMenuVideo[0]));

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

@@ -49,6 +49,7 @@
 
 #define ADM_EDITOR_AUDIO_BUFFER_SIZE (128*1024*6*sizeof(float))
 #define AVS_PROXY_DUMMY_FILE "::ADM_AVS_PROXY::"
+#define WORK_AROUND_BAD_PTS
 /**
     \enum _ENV_EDITOR_FLAGS
 */
@@ -107,7 +108,7 @@
                     bool        switchToSegment(uint32_t s,bool dontdecode=false);
                     uint32_t    currentFrame;
 
-                    bool        nextPictureInternal(uint32_t ref,ADMImage *image);
+                    bool        nextPictureInternal(uint32_t ref,ADMImage *image,uint64_t time=0);
                     bool        samePictureInternal(uint32_t ref,ADMImage *image);
                     bool        seektoTime(uint32_t ref,uint64_t timeToSeek,bool dontdecode=false);
                     // Some useful functions...
@@ -148,6 +149,8 @@
                     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
+                    bool        endOfStream; // The decoder has been flushed and no more compressed images from demuxer
 //****************************** Audio **********************************
                     // _audiooffset points to the offset / the total segment
                     // not the used part !
@@ -250,10 +253,14 @@
                     bool        rewind(void);
 // Used for stream copy
                     bool        GoToIntraTime_noDecoding(uint64_t time,uint32_t *toframe=NULL);
-                    bool        getCompressedPicture(uint64_t delay,ADMCompressedImage *img);     //COPYMODE
+                    bool        getCompressedPicture(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);
+private:
+                    uint64_t    totalExtraDelay;
+                    int64_t     desyncScore;
 public:
                     uint8_t	    updateVideoInfo(aviInfo *info);
                     uint32_t 	getSpecificMpeg4Info( void );

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp Changed

@@ -18,6 +18,7 @@
 #include <math.h>
 #include "ADM_cpp.h"
 #include "ADM_default.h"
+#include "ADM_vidMisc.h"
 #include "ADM_edit.hxx"
 
 #if 0
@@ -232,9 +233,29 @@
 goto np_nextSeg;
 }else 
 { // Not in cache, decode next one
- if(false== nextPictureInternal(seg->_reference,image))
+ // but don't go past the end of the last segment
+ uint64_t maxPts=0;
+ if(_currentSegment+1 == _segments.getNbSegments())
+ maxPts=seg->_refStartTimeUs+seg->_durationUs;
+ if(false== nextPictureInternal(seg->_reference,image,maxPts))
 {
- goto np_nextSeg;
+ uint64_t nkfPts=maxPts;
+ uint32_t frame=0;
+ if(searchNextKeyFrameInRef(seg->_reference,refPts,&nkfPts) && nkfPts<maxPts)
+ {
+ frame=_segments.intraTimeToFrame(seg->_reference,nkfPts);
+ ADM_warning("Trying to skip to the next keyframe %" PRIu32" at %s in ref\n",frame,ADM_us2plain(nkfPts));
+ }
+ if(frame && DecodePictureUpToIntra(seg->_reference,frame))
+ {
+ ADM_info("Successfully skipped to the next keyframe\n");
+ cached=vid->_videoCache->getByPts(nkfPts);
+ if(cached)
+ image->duplicate(cached);
+ }else
+ {
+ goto np_nextSeg;
+ }
 }
 }
 // Got it, update timing
@@ -501,37 +522,60 @@
 */
 uint8_t ADM_Composer::dupe(ADMImage *src,ADMImage *dst,_VIDEOS *vid)
 {
- if(src->_colorspace!=ADM_COLOR_YV12)
- {
- // We need to do some colorspace conversion
- // Is there already one ?
- if(!vid->color)
- {
- // vid->color=new COL_Generic2YV12(src->_width,src->_height,src->_colorspace);
- vid->color=new ADMColorScalerSimple(src->_width,src->_height,
- src->_colorspace,ADM_COLOR_YV12);
- }
- // Since it is not YV12 it MUST be a ref
- ADM_assert(src->isRef());
- 
- int srcStrides[3];
- uint8_t *srcPlanes[3];
- int dstStrides[3];
- uint8_t *dstPlanes[3];
+ if(src->_colorspace!=ADM_COLOR_YV12)
+ {
+ // We need to do some colorspace conversion
+ // Is there already one ?
+ if(!vid->color)
+ {
+ vid->color=new ADMColorScalerSimple(src->_width,src->_height,src->_colorspace,ADM_COLOR_YV12);
+ }
+ // Since it is not YV12 it MUST be a ref
+ ADM_assert(src->isRef());
 
- src->GetPitches(srcStrides);
- src->GetReadPlanes(srcPlanes);
- dst->GetPitches(dstStrides);
- dst->GetWritePlanes(dstPlanes);
+ int srcStrides[3];
+ uint8_t *srcPlanes[3];
+ int dstStrides[3];
+ uint8_t *dstPlanes[3];
+ bool needToSwapUV=false;
+ // The src image has U & V already swapped, so that YUV420P output by sws_scale
+ // has swapped colors, meaning correct colors when interpreted as YV12.
+ // If all the data is in Y we have to swap planes here.
+ switch(src->_colorspace)
+ {
+ case ADM_COLOR_RGB32A:
+ case ADM_COLOR_RGB24:
+ case ADM_COLOR_BGR24:
+ case ADM_COLOR_RGB555:
+ needToSwapUV=true;
+ default:break;
+ }
 
- vid->color->convertPlanes(srcStrides,dstStrides,srcPlanes,dstPlanes);
- return 1;
- }
- // nothing to do
-// if(_pp.swapuv)
-//#warning handle swap uv
- dst->duplicate(src);
- return 1;
+ src->GetPitches(srcStrides);
+ src->GetReadPlanes(srcPlanes);
+ dstStrides[0]=dst->GetPitch(PLANAR_Y);
+ dstPlanes[0]=dst->GetWritePtr(PLANAR_Y);
+ if(needToSwapUV)
+ {
+ dstStrides[2]=dst->GetPitch(PLANAR_U);
+ dstStrides[1]=dst->GetPitch(PLANAR_V);
+ dstPlanes[2]=dst->GetWritePtr(PLANAR_U);
+ dstPlanes[1]=dst->GetWritePtr(PLANAR_V);
+ }else
+ {
+ dstStrides[1]=dst->GetPitch(PLANAR_U);
+ dstStrides[2]=dst->GetPitch(PLANAR_V);
+ dstPlanes[1]=dst->GetWritePtr(PLANAR_U);
+ dstPlanes[2]=dst->GetWritePtr(PLANAR_V);
+ }
+
+ vid->color->convertPlanes(srcStrides,dstStrides,srcPlanes,dstPlanes);
+ return 1;
+ }
+ // nothing to do
+ //#warning handle swap uv
+ dst->duplicate(src);
+ return 1;
 }
 /**
 \fn setPostProc

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp Changed

@@ -29,9 +29,6 @@
 #endif
 
 #include "ADM_pp.h"
-// FIXME BADLY !!!
-// This should be in a context somewhere
-static uint8_t compBuffer[MAXIMUM_SIZE * MAXIMUM_SIZE * 3];
 
 /**
 \fn seektoFrame
@@ -45,22 +42,34 @@
 	EditorCache *cache =vid->_videoCache;
 	ADM_assert(cache);
 bool found=false;
+ if(timeToSeek>vid->firstFramePts && !dontdecode)
+ {
+ ADMImage *image=cache->getByPts(timeToSeek);
+ if(image)
+ {
+ vid->lastDecodedPts=vid->lastReadPts=timeToSeek;
+ ADM_info("Image found in cache, pts=%" PRIu64" ms\n",timeToSeek/1000);
+ endOfStream=false;
+ return true;
+ }
+ }
 // Search the previous keyframe for segment....
 uint64_t seekTime;
 if(_segments.isKeyFrameByTime(ref,timeToSeek))
 {
 seekTime=timeToSeek;
- ADM_info("First frame of the new segment is a keyframe at %" PRIu32"ms\n",seekTime/1000);
+ ADM_info("Seeking to a keyframe at %" PRIu64" ms\n",seekTime/1000);
 found=true;
 }else 
 {
 if(false==searchPreviousKeyFrameInRef(ref,timeToSeek,&seekTime))
 {
- ADM_warning("Cannot identify the keyframe before %" PRIu64" ms\n",seekTime/1000);
+ ADM_warning("Cannot identify the keyframe before %" PRIu64" ms\n",timeToSeek/1000);
 return false;
 }
 }
 uint32_t frame=_segments.intraTimeToFrame(ref,seekTime);
+ ADM_info("Seeking to frame %" PRIu32" at %" PRIu64" ms\n",frame,seekTime/1000);
 if(dontdecode==true)
 {
 vid->lastSentFrame=frame;
@@ -71,7 +80,7 @@
 
 if(false==DecodePictureUpToIntra(ref,frame))
 {
- ADM_warning("Cannot decode up to intra %" PRIu64" at %" PRIu64" ms\n",frame,seekTime/1000);
+ ADM_warning("Cannot decode up to intra %" PRIu32" at %" PRIu64" ms\n",frame,seekTime/1000);
 return false;
 }
 if(found==true) return true;
@@ -92,7 +101,7 @@
 }
 if(pts>timeToSeek)
 {
- ADM_info("Image not found,searching %" PRIu64" ms, got pts=%" PRIu64" ms\n",timeToSeek/1000,pts/1000);
+ ADM_info("Image not found, looked for %" PRIu64" us, got pts=%" PRIu64" us\n",timeToSeek,pts);
 return false;
 }
 }
@@ -130,13 +139,12 @@
 \brief returns the next picture
 @param out : Where to put the decoded image to
 @param ref : Video we are dealing with
+ @param time: Discard the image if pts in ref >= time, ignore if time = 0
 @return true on success, false on failure
 
 */
-bool ADM_Composer::nextPictureInternal(uint32_t ref,ADMImage *out)
+bool ADM_Composer::nextPictureInternal(uint32_t ref,ADMImage *out,uint64_t time)
 {
- ADMImage	*result;
- 
 _VIDEOS *vid=_segments.getRefVideo(ref);
 EditorCache *cache=vid->_videoCache;
 ADM_assert(vid);
@@ -146,6 +154,11 @@
 	// Try decoding loop rames ahead, if not we can consider it fails
 while(loop--)
 {
+ if(endOfStream)
+ {
+ ADM_warning("End of stream, skipping decoding the next picture\n");
+ return false;
+ }
 // first decode a picture, cannot hurt...
 if(DecodeNextPicture(ref)==false)
 {
@@ -156,6 +169,11 @@
 ADMImage *img=cache->getAfter(vid->lastReadPts);
 if(img)
 {
+ if(time && img->Pts!=ADM_NO_PTS && img->Pts>=time)
+ {
+ ADM_warning("Next image PTS in ref is out of range: got %" PRIu64" us, wanted < %" PRIu64" us, discarding the image\n",img->Pts,time);
+ return false;
+ }
 // Duplicate
 if(out)
 {
@@ -191,15 +209,18 @@
 */
 bool ADM_Composer::DecodeNextPicture(uint32_t ref)
 {
-uint8_t ret = 0;
 EditorCache *cache;
 ADMImage	*result;
+ bool drain=false;
 uint32_t flags;
- ADMCompressedImage img;
 _VIDEOS *vid=_segments.getRefVideo(ref);
 vidHeader *demuxer=vid->_aviheader;
-	cache=vid->_videoCache;
+ ADM_assert(vid->decoder);
+ if(vid->decoder->endOfStreamReached())
+ return false;
+ cache=vid->_videoCache;
 // PlaceHolder...
+ ADMCompressedImage img;
 img.data=compBuffer;
 img.cleanup(vid->lastSentFrame+1);
 
@@ -210,41 +231,52 @@
 aprintf("[EditorRender] DecodeNext %u ref:%u\n",frame,ref);
 // Fetch frame
 aprintf("[Editor] Decoding frame %u\n",frame);
- if (!demuxer->getFrame (frame,&img))
- {
+ drain=vid->decoder->getDrainingState();
+ if(!drain)
+ {
+ if(!demuxer->getFrame(frame,&img))
+ {
 ADM_warning("getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
- return false;
- }
-
- // Now uncompress it...
- result=cache->getFreeImage();
- if(!result)
- {
- ADM_warning(" Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
- return false;
- }
+ drain=true;
+ vid->decoder->setDrainingState(true);
+ }else
+ {
+ endOfStream=false;
+ }
+ }
+ // Now uncompress it...
+ result=cache->getFreeImage();
+ if(!result)
+ {
+ ADM_warning(" Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
+ return false;
+ }
+ if(!drain)
+ {
 aprintf("Demuxed frame %" PRIu32" with pts=%" PRId64" us, %" PRId64" ms\n",
 frame,
 img.demuxerPts,
 img.demuxerPts/1000);
- 
- if(!decompressImage(result,&img,ref))
- {
- ADM_info("Decoding error for frame %" PRIu32", not necessarily a problem\n",vid->lastSentFrame);
- stats.nbNoImage++;
- cache->invalidate(result);
+ }
+ if(!decompressImage(result,&img,ref))
+ {
+ ADM_info("Decoding error for frame %" PRIu32", not necessarily a problem\n",vid->lastSentFrame);
+ 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) // No PTS available ?
+ 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;
- if(img.demuxerDts!=ADM_NO_PTS && vid->_aviheader->providePts()==false)
+ if(img.demuxerDts!=ADM_NO_PTS && (vid->dontTrustBFramePts || vid->_aviheader->providePts()==false))
 {
 if(img.demuxerDts>vid->lastDecodedPts)
 {
@@ -252,7 +284,6 @@
 vid->lastDecodedPts=img.demuxerDts;
 }
 }
- 
 result->Pts=vid->lastDecodedPts;
 }else
 {
@@ -390,7 +421,6 @@
 */
 bool ADM_Composer::DecodePictureUpToIntra(uint32_t ref,uint32_t frame)
 {
- uint8_t ret = 0;
 EditorCache *cache;
 ADMImage	*result;
 uint32_t flags,flagsNext=0;
@@ -400,11 +430,11 @@
 img.data=compBuffer;
 img.cleanup(frame);
 
- ADM_info(" DecodeUpToInta %u ref:%u\n",frame,ref);
-	_VIDEOS *vid=_segments.getRefVideo(ref);
+ ADM_info("Decoding up to intra frame %u, ref: %u\n",frame,ref);
+ _VIDEOS *vid=_segments.getRefVideo(ref);
 vidHeader *demuxer=vid->_aviheader;
-	cache=vid->_videoCache;
-	ADM_assert(cache);
+ cache=vid->_videoCache;
+ ADM_assert(cache);
 // Make sure frame is an intra, or the next field is intra
 demuxer->getFlags(frame,&flags);
 demuxer->getFlags(frame+1,&flagsNext);
@@ -420,12 +450,19 @@
 aprintf("[EditorRender] DecodeUpToIntra flushing cache & codec\n");
 cache->flush();
 vid->decoder->flush();
+ vid->decoder->setEndOfStream(false);
+ endOfStream=false;
 // The PTS associated with our frame is the one we are looking for
 uint64_t wantedPts=demuxer->estimatePts(frame);
 uint32_t tries=15+7; // Max Ref frames for H264 + MaxRecovery , let's say 7 is ok for recovery
 bool syncFound=false;
 while(found==false && tries--)
 {
+ if(vid->decoder->endOfStreamReached())
+ {
+ ADM_warning("End of stream reached\n");
+ break;
+ }
 // Last frame ? if so repeat
 if(vid->lastSentFrame>=nbFrames-1) vid->lastSentFrame=nbFrames-1;
 // Fetch frame
@@ -435,7 +472,7 @@
 {
 ADM_warning(" getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
 //cache->flush();
- return false;
+ vid->decoder->setDrainingState(true);
 }
 // Now uncompress it...
 result=cache->getFreeImage();

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp Changed

@@ -32,7 +32,7 @@
 int lastSeg=_segments.getNbSegments();
 uint32_t seg;
 bool switchedSeg=false;
-bool r;
+bool r=false;
     // 1- Convert frameTime to segments
     if(false== _segments.convertLinearTimeToSeg(  *frameTime, &seg, &segTime))
     {
@@ -46,10 +46,20 @@
     // 2- Now search the previous keyframe in the ref image...
     // The time in reference = relTime+segmentStartTime
     refTime=s->_refStartTimeUs+segTime; // Absolute time in the reference image
-    
-    if(switchedSeg && refTime>0) refTime--; // The next segment may start with a keyframe
 
-    r=searchNextKeyFrameInRef(ref,refTime,&nkTime);
+    if(switchedSeg && !refTime)
+    {
+        _VIDEOS *vid=_segments.getRefVideo(ref);
+        if(!vid->firstFramePts)
+        {
+            nkTime=0;
+            r=true;
+        }
+    }
+    if(switchedSeg && refTime>0)
+        refTime--; // The next segment may start with a keyframe
+    if(r==false)
+        r=searchNextKeyFrameInRef(ref,refTime,&nkTime);
 
     // 3- if it does not belong to the same seg  ....
     if(r==false || nkTime >= (s->_refStartTimeUs+s->_durationUs))
@@ -68,6 +78,7 @@
         seg++;
         switchedSeg=true;
         segTime=0;
+        r=false;
         goto again;
     }
     // Gotit, now convert it to the linear time
@@ -103,10 +114,12 @@
           if(!s->_refStartTimeUs)
           {
               uint64_t pts=vid->firstFramePts;
-              //
-              *frameTime+=pts;
-              ADM_warning("This video does not start at 0 but at %" PRIu64" ms, compensating\n",pts/1000);
-              _segments.convertLinearTimeToSeg(  *frameTime, &seg, &segTime);
+              if(pts)
+              {
+                  *frameTime+=pts;
+                  ADM_warning("This video does not start at 0 but at %" PRIu64" ms, compensating\n",pts/1000);
+                  _segments.convertLinearTimeToSeg(*frameTime, &seg, &segTime);
+              }
            }
       }
     // 
@@ -249,12 +262,12 @@
             worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
             if(worked && pts != ADM_NO_PTS)
                 break; // found
-            tmpFrame--;
             if(!tmpFrame)
             {
-                ADM_warning("The whole segment is corrupted. Aborting the search");
+                ADM_warning("The whole segment is corrupted. Aborting the search\n");
                 return false;
             }
+            tmpFrame--;
             skipped++;
         } while(true);
         if(pts == refTime)
@@ -263,7 +276,7 @@
         { // if we slid past the target frame...
             pivotPrintf("skipped %" PRIu32" frames seeking back\n",skipped);
             skipped = 0;
-            tmpFrame = curFrame; // ...go back to the frame where we first encountered corrupted video...
+            tmpFrame = curFrame + 1; // ...go back to the frame where we first encountered corrupted video...
             do
             { // ...and seek forward until we get a valid pts
                 pts = ADM_NO_PTS;
@@ -273,7 +286,7 @@
                 tmpFrame++;
                 if(tmpFrame == nbFrame)
                 {
-                    ADM_warning("The whole segment is corrupted. Aborting the search");
+                    ADM_warning("The whole segment is corrupted. Aborting the search\n");
                     return false;
                 }
                 skipped++;
@@ -283,7 +296,7 @@
                 pivotPrintf("skipped %" PRIu32" frames seeking forward\n",skipped);
                 if(pts > refTime)
                 {
-                    ADM_warning("The video at the specified time in ref is corrupted. Aborting seek");
+                    ADM_warning("The video at the specified time in ref is corrupted. Aborting seek\n");
                     return false;
                 }else
                 {
@@ -335,6 +348,8 @@
 
 bool ADM_Composer::searchPreviousKeyFrameInRef(int ref,uint64_t refTime,uint64_t *nkTime)
 {
+    if(!refTime)
+        return false;
     // Search for the current frame with quick search
     _VIDEOS *v = _segments.getRefVideo(ref);
     uint32_t nbFrame = v->_nb_video_frames;
@@ -448,8 +463,16 @@
               pts=ADM_NO_PTS;    
               v->_aviheader->getFlags(frame,&flags);
               if(!(flags & AVI_KEY_FRAME)) continue;
+              // if B-frames are present, pts doesn't necessarily become smaller when frame is decremented,
+              // we must check whether pts is still in range and effectively go a full GOP backwards if not
+              ADM_info("frame %d is an intra, checking whether pts is in range...\n",frame);
               v->_aviheader->getPtsDts(frame,&pts,&dts);
-              if(pts==ADM_NO_PTS) continue;          
+              if(pts==ADM_NO_PTS) continue;
+              if(pts>=endTimeInRef)
+              {
+                  ADM_warning("frame %d pts in ref = %" PRIu64" is not in range, skipping\n",frame,pts);
+                  continue;
+              }
               ADM_info("found last keyframe at %d, time in reference=%s\n",frame,ADM_us2plain(pts));
               break;
           }

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp Changed

@@ -26,6 +26,8 @@
 #define aprintf(...) {}// printf
 #endif
 
+static int warn_cnt=0;
+
 /**
 \fn checkCutsAreOnIntra
 \brief In copy mode, if the cuts are not on intra we will run into trouble :
@@ -59,7 +61,7 @@
 fail=true;
 break;
 }
- if(!img.flags & AVI_KEY_FRAME)
+ if(!(img.flags & AVI_KEY_FRAME))
 {
 ADM_warning("Segment %d does not start on a keyframe (%s)\n",i,ADM_us2plain(img.demuxerPts));
 fail=true;
@@ -68,8 +70,8 @@
 // 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 refDTS=%" PRIu64"\n",seg->_reference,seg->_refStartDts);
- ADM_info("seg:%d imgDTS=%" PRIu64"\n",seg->_reference,img.demuxerDts);
+ 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)
 {
 ADM_info("Ignoring first seg (unreliable DTS)\n");
@@ -78,7 +80,7 @@
 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.demuxerPts));
+ 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;
@@ -91,6 +93,61 @@
 return true;
 }
 /**
+ \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)
+{
+ 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
+
+ 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;
+
+ if(switchToSegment(segNo,true))
+ {
+ 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
+ {
+ ADM_info("Cannot get the 1st frame of segment %d\n",segNo);
+ }
+ 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)
+ {
+ 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(!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)
@@ -117,69 +174,79 @@
 */
 bool ADM_Composer::getNonClosedGopDelay(uint64_t time,uint32_t *delay)
 {
- aviInfo info;
- uint32_t segNo;
- uint64_t segTime;
+ aviInfo info;
+ int found;
+ uint32_t startSegNo;
+ uint64_t segTime;
 *delay=0;
- if(!_segments.convertLinearTimeToSeg(time,&segNo,&segTime))
- {
+ if(!_segments.convertLinearTimeToSeg(time,&startSegNo,&segTime))
+ {
 ADM_warning("Cannot navigate to get nonclosedgop\n");
 return false;
- }
- _SEGMENT *seg=_segments.getSegment(segNo);
- ADM_assert(seg);
- _VIDEOS *vid=_segments.getRefVideo(seg->_reference); 
- uint64_t pts,dts;
- 
- vid->_aviheader->getVideoInfo (&info);
- //
- if(bFrameDroppable(info.fcc))
- {
- return true; // no need to add extra delay
 }
- // Look ahead to see if we have some late bframe in the past
- int nb=vid->_aviheader->getMainHeader ()->dwTotalFrames;
- int found=-1;
- if(!segTime)
+
+ for(uint32_t segNo=startSegNo; segNo < _segments.getNbSegments(); segNo++)
 {
- found=0;
- vid->_aviheader->getPtsDts(0,&pts,&dts);
- }
- else
- for(int i=0;i<nb;i++)
+ _SEGMENT *seg=_segments.getSegment(segNo);
+ ADM_assert(seg);
+ _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+ uint64_t pts,dts;
+
+ vid->_aviheader->getVideoInfo (&info);
+ if(bFrameDroppable(info.fcc))
 {
- vid->_aviheader->getPtsDts (i,&pts,&dts);
- if(pts==segTime)
- {
+ return true; // no need to add extra delay
+ }
+ // Look ahead to see if we have some late bframe in the past
+ int nb=vid->_aviheader->getMainHeader ()->dwTotalFrames;
+ if(segNo > startSegNo)
+ segTime=0;
+ uint64_t refTime=segTime+seg->_refStartTimeUs;
+ found=-1;
+ if(!refTime)
+ {
+ found=0;
+ vid->_aviheader->getPtsDts(0,&pts,&dts);
+ }else
+ {
+ for(int i=0;i<nb;i++)
+ {
+ vid->_aviheader->getPtsDts (i,&pts,&dts);
+ if(pts==refTime)
+ {
 found=i;
 break;
- }
+ }
+ }
 }
- if(found==-1)
- {
- ADM_warning("Cannot find the frame\n");
- return false;
- }
- for(int i=found+1;i<found+16;i++)
- {
+ if(found==-1)
+ {
+ ADM_warning("Cannot find the frame for segment %" PRIu32"\n");
+ continue;
+ }
+ for(int i=found+1;i<found+16;i++)
+ {
 uint32_t flags;
 vid->_aviheader->getFlags(i,&flags);
 if(!(flags & AVI_B_FRAME))
 {
 ADM_info("Not a bframe, stopping (%d)\n",i-found);
- break;
+ break;
 }
 vid->_aviheader->getPtsDts(i,&pts,&dts);
- if(pts<segTime)
- {
+ if(pts<refTime)
+ {
 ADM_info("frame %d is early \n",i);
- uint32_t delta=segTime-pts;
+ uint32_t delta=refTime-pts;
 if(delta>*delay) *delay=delta;
- }else
- {
- ADM_info("Pts delta = %d\n",(int)(pts-segTime));
- }
+ }else
+ {
+ ADM_info("Pts delta = %d\n",(int)(pts-refTime));
+ }
+ }
 }
+ if(found==-1)
+ return false;
 ADM_info("Found maximum non closed gop delay = %d\n",*delay);
 return true;
 }
@@ -195,13 +262,22 @@
 
 
 */
-bool ADM_Composer::getCompressedPicture(uint64_t videoDelay,ADMCompressedImage *img)
+bool ADM_Composer::getCompressedPicture(uint64_t videoDelay,bool sanitize,ADMCompressedImage *img)
 {
 uint64_t tail;
 //
 int64_t signedPts;
 int64_t signedDts;
 
+#define MAX_EXTRA_DELAY 100000
+#define CATCH_UP_RATE 5000
+#define MAX_DESYNC_SCORE 20*100000
+#define DESYNC_THRESHOLD 20000
+#define ENOUGH 4
+
+ if(totalExtraDelay>=CATCH_UP_RATE)
+ totalExtraDelay-=CATCH_UP_RATE; // gradually reduce extra delay, CATCH_UP_RATE/1000 ms at a time
+
 againGet:
 static uint32_t fn;
 fn++;
@@ -212,14 +288,16 @@
 vidHeader *demuxer=vid->_aviheader;
 ADM_assert(demuxer);
 
+ // Prepare to deal with field-encoded streams
+ uint64_t timeIncrement=vid->timeIncrementInUs;
 // Get next pic?
 if(false==demuxer->getFrame (vid->lastSentFrame,img))
 {
 ADM_info("Failed to get next frame for ref %" PRIu32"\n",seg->_reference);
 goto nextSeg;
 }
- aprintf("Got frame %d, PTS=%s ",img->demuxerFrameNo,ADM_us2plain(img->demuxerPts));
- aprintf("DTS=%s \n",ADM_us2plain(img->demuxerDts));
+ aprintf("Got frame %d, PTS=%s ",vid->lastSentFrame,ADM_us2plain(img->demuxerPts));
+ aprintf("DTS=%s\n",ADM_us2plain(img->demuxerDts));
 vid->lastSentFrame++;
 //
 aviInfo info;
@@ -283,12 +361,14 @@
 // ADM_info("Frame : Flags :%X, DTS:%"PRId64" PTS=%"PRId64" nextDts=%"PRId64" tail=%"PRId64"\n",img->flags,img->demuxerDts/1000,img->demuxerPts/1000,_nextFrameDts,tail);
 if(img->demuxerDts!= ADM_NO_PTS && img->demuxerDts>=tail) 
 {
- aprintf("DTS is too late, switching (%s)\n",ADM_us2plain(img->demuxerDts));
+ std::string tailAsString=std::string(ADM_us2plain(tail));
+ ADM_info("DTS is too late, switching segment (%s vs %s)\n",ADM_us2plain(img->demuxerDts),tailAsString.c_str());
 goto nextSeg;
 }
 if(img->demuxerPts!= ADM_NO_PTS && img->demuxerPts>=tail) 
 {
- aprintf("PTS is too late, switching (%s)\n",ADM_us2plain(img->demuxerDts));
+ std::string tailAsString=std::string(ADM_us2plain(tail));
+ ADM_info("PTS is too late, switching segment (%s vs %s)\n",ADM_us2plain(img->demuxerPts),tailAsString.c_str());
 goto nextSeg;
 }
 
@@ -296,30 +376,39 @@
 // so the caller can delay everything but recalibrate will clamp the value
 // so we use correctedDts so that the value is ok
 if(img->demuxerDts==ADM_NO_PTS)
+ {
+ aprintf("DTS unset for frame %" PRIu32"\n",vid->lastSentFrame-1);
 signedDts=ADM_NO_PTS;
- else
+ }else
 {
 signedDts=(int64_t)img->demuxerDts;
+ signedDts+=totalExtraDelay;
 recalibrateSigned(&(signedDts),seg);
+ aprintf("Signed Dts=%s ",ADM_us2plain(signedDts));
 }
 
 if(img->demuxerPts==ADM_NO_PTS)
+ {
+ aprintf("PTS unset for frame %" PRIu32"\n",vid->lastSentFrame-1);
 signedPts=ADM_NO_PTS;
- else
+ }else
 {
 signedPts=(int64_t)img->demuxerPts;
+ signedPts+=totalExtraDelay;
 recalibrateSigned(&(signedPts),seg);
+ aprintf("Signed Pts=%s\n",ADM_us2plain(signedPts));
 }
- aprintf("Signed Pts=%s ",ADM_us2plain(signedPts));
- aprintf("Signed Dts=%s \n",ADM_us2plain(signedDts));
+ // Halve timeIncrement for field-encoded MPEG-2 streams...
+ if(isMpeg12Compatible(info.fcc) && img->flags & (AVI_STRUCTURE_TYPE_MASK+AVI_FIELD_STRUCTURE))
+ timeIncrement/=2;
 // From here we are in linear time, guess DTS if missing...
 if(signedDts==ADM_NO_PTS)
 {
 	// border case due to rounding we can have pts slighly above dts
-	if(signedPts!=ADM_NO_PTS && _nextFrameDts!=ADM_NO_PTS)
+	if(_nextFrameDts!=ADM_NO_PTS)
 	{
- signedDts=_nextFrameDts;
- if(signedPts != ADM_NO_PTS && signedDts>signedPts)
+ signedDts=_nextFrameDts;
+ if(signedPts != ADM_NO_PTS && signedDts>signedPts)
 		{
 			// not sure it is correct. We may want to do it the other way around, i.e. bumping pts
 			ADM_warning("Compensating for rounding error with PTS=%" PRId64"ms DTS=%" PRId64"ms \n",signedPts,signedDts);
@@ -330,29 +419,74 @@
 {
 // It means that the incoming image is earlier than the expected time.
 // we add a bit of timeIncrement to compensate for rounding
- if(_nextFrameDts!=ADM_NO_PTS)
+ if(sanitize && _nextFrameDts!=ADM_NO_PTS)
 {
- if(_nextFrameDts>(signedDts+(int64_t)(vid->timeIncrementInUs/3)))
+ if(_nextFrameDts>(signedDts+(int64_t)(timeIncrement/3)))
 {
 double delta=_nextFrameDts-signedDts;
 delta=fabs(delta);
- ADM_error("Frame %d DTS is going back in time: expected: %s : %d\n",
+ if((uint64_t)delta<MAX_EXTRA_DELAY && totalExtraDelay<MAX_EXTRA_DELAY)
+ {
+ ADM_warning("Frame %d DTS is going back in time, delaying it for %" PRIu64" us\n",(int)vid->lastSentFrame,(uint64_t)delta);
+ signedDts=_nextFrameDts;
+ totalExtraDelay+=(uint64_t)delta;
+ ADM_info("total extra delay = %" PRIu64" us\n",totalExtraDelay);
+ signedPts+=totalExtraDelay;
+ }else
+ {
+ ADM_error("Frame %d DTS is going back in time: expected: %s : %d\n",
 (int)vid->lastSentFrame,
 ADM_us2plain(_nextFrameDts),
 (_nextFrameDts));
- ADM_error("and got %s : %d, timeIncrement=%d us, delta=%d\n",
+ ADM_error("and got %s : %d, timeIncrement=%d us, delta=%d\n",
 ADM_us2plain(signedDts),
- signedDts,(int)vid->timeIncrementInUs,
+ signedDts,(int)timeIncrement,
 (int)delta);
- 
- goto againGet;
+ uint64_t linearTime=img->demuxerPts-seg->_refStartTimeUs+seg->_startTimeUs;
+ char msg[512+1];
+ if(img->flags & AVI_KEY_FRAME)
+ {
+ snprintf(msg,512,QT_TRANSLATE_NOOP("adm",
+ "Decode time stamp (DTS) collision affecting a keyframe at %s detected.\n"
+ "Dropping a keyframe will result in severely corrupted video.\n"
+ "Proceed anyway?"),ADM_us2plain(linearTime));
+ }else
+ {
+ snprintf(msg,512,QT_TRANSLATE_NOOP("adm",
+ "Decode time stamp (DTS) collision affecting a frame at %s detected.\n"
+ "Dropping a frame may result in some video corruption.\n"
+ "Proceed anyway?"),ADM_us2plain(linearTime));
+ }
+ if(warn_cnt>=0)
+ {
+ if(!GUI_Question(msg))
+ {
+ warn_cnt=0;
+ desyncScore=0;
+ totalExtraDelay=0;
+ return false;
+ }else
+ {
+ warn_cnt++;
+ }
+ }
+ if(warn_cnt>ENOUGH)
+ { // warn ENOUGH+1 times in a row then suggest going silent
+ if(GUI_Question(QT_TRANSLATE_NOOP("adm","Do not warn again and drop frames silently while saving this video?")))
+ warn_cnt=-1; // Yes: don't warn
+ else
+ warn_cnt=0; // No: ask again after ENOUGH+1 more warnings
+ }
+
+ goto againGet;
+ }
 }
 }
 _nextFrameDts=signedDts;
 }
 // Increase for next one
 if(ADM_NO_PTS!=_nextFrameDts)
- _nextFrameDts+=vid->timeIncrementInUs;
+ _nextFrameDts+=timeIncrement;
 // Check the DTS is not too late compared to next seg beginning...
 if(_currentSegment+1<_segments.getNbSegments() && img->demuxerDts!=ADM_NO_PTS)
 {
@@ -376,8 +510,10 @@
 // **
 // ADM_info("Frame after RECAL: Flags :%X, DTS:%"PRId64" PTS=%"PRId64" tail=%"PRId64"\n",img->flags,img->demuxerDts/1000,img->demuxerPts/1000,tail);
 {
- int64_t finalDts=signedDts+(int64_t)videoDelay;
- if(finalDts<0) 
+ int64_t finalDts=ADM_NO_PTS;
+ if(signedDts!=ADM_NO_PTS)
+ finalDts=signedDts+(int64_t)videoDelay;
+ if(finalDts!=ADM_NO_PTS && finalDts<0)
 {
 ADM_warning("Final DTS <0, dropping it \n");
 finalDts=0;
@@ -385,24 +521,62 @@
 }
 img->demuxerDts=finalDts;
 }
- img->demuxerPts=signedPts+(int64_t)videoDelay;
+ if(signedPts!=ADM_NO_PTS)
+ img->demuxerPts=signedPts+(int64_t)videoDelay;
+ else
+ img->demuxerPts=ADM_NO_PTS;
 aprintf("Final Pts=%s ",ADM_us2plain(img->demuxerPts));
 aprintf("Final Dts=%s ",ADM_us2plain(img->demuxerDts)); 
- aprintf("Delay =%s ",ADM_us2plain(videoDelay)); 
+ aprintf("Delay=%s\n",ADM_us2plain(videoDelay));
+#if 0
+ {
+ std::string ptsAsString,dtsAsString,frameTypeAsString;
+ ptsAsString=std::string(ADM_us2plain(img->demuxerPts));
+ dtsAsString=std::string(ADM_us2plain(img->demuxerDts));
+ frameTypeAsString="P";
+ if(img->flags & AVI_KEY_FRAME) frameTypeAsString="I";
+ if(img->flags & AVI_B_FRAME) frameTypeAsString="B";
+ printf("Frame %" PRIu32", DTS=%s, PTS=%s, type: %s\n",vid->lastSentFrame-1,dtsAsString.c_str(),ptsAsString.c_str(),frameTypeAsString.c_str());
+ }
+#endif
+ if(MAX_EXTRA_DELAY && totalExtraDelay>DESYNC_THRESHOLD && desyncScore>=0)
+ {
+ desyncScore+=(vid->timeIncrementInUs)*totalExtraDelay/MAX_EXTRA_DELAY;
+ aprintf("Desync score = %" PRId64"\n",desyncScore);
+ }
+ if(desyncScore>MAX_DESYNC_SCORE)
+ {
+ uint64_t linearTime=img->demuxerPts-seg->_refStartTimeUs+seg->_startTimeUs;
+ char msg[512+1];
+ snprintf(msg,512,QT_TRANSLATE_NOOP("adm",
+ "While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. "
+ "Would you like to continue nevertheless?"),ADM_us2plain(linearTime));
+ if(!GUI_Question(msg))
+ {
+ desyncScore=0;
+ totalExtraDelay=0;
+ warn_cnt=0;
+ return false;
+ }
+ desyncScore=-1; // ignore future desync
+ }
 return true;
 
 nextSeg:
 if(false==switchToNextSegment(true))
 {
 ADM_warning("Cannot update to new segment\n");
+ totalExtraDelay=0;
+ ADM_info("Accumulated desync score = %" PRId64"\n",desyncScore);
+ desyncScore=0;
+ warn_cnt=0;
 return false;
 }
 // Mark it as drop b frames...
 _SEGMENT *thisseg=_segments.getSegment(_currentSegment);
 thisseg->_dropBframes=_SEGMENT::ADM_DROP_MAYBE_AFER_SWITCH;
 ADM_info("Retrying for next segment\n");
- return getCompressedPicture(videoDelay,img);
- 
+ return getCompressedPicture(videoDelay,sanitize,img);
 }
 
 /**

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp Changed

@@ -64,6 +64,9 @@
   markerAPts = 0;
   markerBPts = 0;
   stats.reset();
+
+    totalExtraDelay=0;
+    desyncScore=0;
 }
 /**
 	Remap 1:1 video to segments
@@ -244,13 +247,22 @@
         {
          char str[512+1];
          str[0] = '\0';
+         int both=-1;
          if( info0.width != infox.width )
-            strcpy(str,"width");
+         {
+            both++;
+            strcpy(str,QT_TRANSLATE_NOOP("ADM_Composer","width"));
+         }
          if( info0.height != infox.height )
+         {
+            both++;
             snprintf(str+strlen(str),512-strlen(str),
-              "%sheight%sdifferent between first and this video stream",
-                 (strlen(str)?" and ":""),
-                 (strlen(str)?" are ":" is ") );
+                QT_TRANSLATE_NOOP("ADM_Composer","%sheight"),
+                (both? QT_TRANSLATE_NOOP("ADM_Composer"," and ") : ""));
+         }
+         snprintf(str+strlen(str),512-strlen(str),
+            QT_TRANSLATE_NOOP("ADM_Composer","%sdifferent between first and this video stream"),
+            (both? QT_TRANSLATE_NOOP("ADM_Composer"," are ") : QT_TRANSLATE_NOOP("ADM_Composer"," is ")));
          str[512] = '\0';
          GUI_Error_HIG(str,QT_TRANSLATE_NOOP("ADM_Composer","You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:\n1.) \"resize\" / \"add border\" / \"crop\" each stream to the same resolution\n2.) concatenate them together"));
          delete video._aviheader;
@@ -412,7 +424,7 @@
         }
      }
     int lastVideo=_segments.getNbSegments();
-    if(lastVideo && video._aviheader->unreliableBFramePts()&& isH264Compatible(info.fcc))
+    if(lastVideo && isH264Compatible(info.fcc))
     {
         ADM_info("H264 in mp4 sometimes has invalid timestamps which confuse avidemux, checking\n");
         checkForValidPts(_segments.getSegment(lastVideo-1)); 
@@ -422,6 +434,7 @@
         ADM_info("Halving Fps...\n");
         _segments.halfFps();
     }
+    endOfStream=false;
   return 1;
 }
 #if 0
@@ -520,6 +533,7 @@
   
   _segments.deleteAll();
   _currentPts = 0;
+  _currentSegment = 0;
   markerAPts = 0;
   markerBPts = 0;
   audioTrackPool.clear();

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

@@ -76,16 +76,19 @@
 ADM_info("First PTS is %s\n",ADM_us2plain(pts));
 }
 
- updateStartTime();
 //
 n=segments.size();
 if(n)
 {
 _SEGMENT *seg=getSegment(n-1);
 uint64_t dur=ref->_aviheader->getVideoDuration();
+#ifdef ADM_ZERO_OFFSET
+ seg->_refStartTimeUs=pts;
+ seg->_durationUs=dur-pts;
+#endif
 printf("Current duration %" PRIu64" ms real one %" PRIu64" ms\n",dur/1000,seg->_durationUs/1000);
 }
-
+ updateStartTime();
 return true;
 }
 /**
@@ -114,7 +117,7 @@
 // Probe the real time increment as the value determined from FPS may be incorrect due to interlace
 uint64_t firstNonZeroDts=ADM_NO_PTS,pts,dts;
 int firstNonZeroDtsFrame;
- ADM_info("[editor] Original frame increment %s %d\n",ADM_us2plain(ref->timeIncrementInUs),(int)ref->timeIncrementInUs);
+ ADM_info("Original frame increment %s = %" PRIu64" us\n",ADM_us2plain(ref->timeIncrementInUs),ref->timeIncrementInUs);
 uint64_t minDelta=100000;
 uint64_t maxDelta=0;
 for (int frame=0; frame<info.nb_frames; frame++)
@@ -135,14 +138,14 @@
 firstNonZeroDtsFrame=frame;
 }
 }
- ADM_info("[Editor] min increment %s - %d\n",ADM_us2plain(minDelta),(int)minDelta);
- ADM_info("[Editor] max increment %s - %d\n",ADM_us2plain(maxDelta),(int)maxDelta);
+ ADM_info("min increment %s = %" PRIu64" us\n",ADM_us2plain(minDelta),minDelta);
+ ADM_info("max increment %s = %" PRIu64" us\n",ADM_us2plain(maxDelta),maxDelta);
 
 //if (minDelta==ref->timeIncrementInUs*2)
 //ref->timeIncrementInUs=minDelta;
 
 
- ADM_info("[Editor] About %" PRIu64" microseconds per frame\n",ref->timeIncrementInUs);
+ ADM_info("About %" PRIu64" microseconds per frame\n",ref->timeIncrementInUs);
 ref->_nb_video_frames = info.nb_frames;
 //
 // And automatically create the segment
@@ -164,10 +167,16 @@
 demuxer->getPtsDts(0,&pts,&dts);
 ref->firstFramePts=0;
 if(pts==ADM_NO_PTS) ADM_warning("First frame has unknown PTS\n");
+ if(dts==ADM_NO_PTS) ADM_warning("The first frame DTS is not set\n");
+ else ADM_info("The first frame DTS = %" PRIu64" ms\n",dts/1000);
 if(pts!=ADM_NO_PTS &&pts)
 {
 ADM_warning("The first frame has a PTS >0, adjusting to %" PRIu64" ms\n",pts/1000);
 ref->firstFramePts=pts;
+#ifdef ADM_ZERO_OFFSET
+ seg._refStartTimeUs=pts;
+ seg._durationUs-=pts;
+#endif
 }
 
 segments.push_back(seg);
@@ -267,6 +276,15 @@
 _VIDEOS *vid=&(videos[i]);
 
 seg._durationUs=vid->_aviheader->getVideoDuration();
+#ifdef ADM_ZERO_OFFSET
+ uint64_t pts=vid->firstFramePts;
+ if(pts!=ADM_NO_PTS && pts)
+ {
+ ADM_warning("The first frame in ref video %d has PTS = %" PRIu64" us, adjusting the segment\n",i,pts);
+ seg._refStartTimeUs=pts;
+ seg._durationUs-=pts;
+ }
+#endif
 seg._reference=i;
 vid->_aviheader->getVideoInfo(&info);
 segments.push_back(seg);
@@ -372,7 +390,7 @@
 {
 uint64_t pts2,dts2;
 demuxer->getPtsDts(0,&pts2,&dts2);
- if(pts2!=ADM_NO_PTS)
+ if(pts2 && pts2!=ADM_NO_PTS)
 {
 ADM_info("Using pts2=%s to get dts, as this video does not start at zero\n",ADM_us2plain(pts2));
 pts=pts2;
@@ -607,8 +625,8 @@
 {
 segments.erase(segments.begin()+startSeg+1);
 }
- updateStartTime();
 removeEmptySegments();
+ updateStartTime();
 if(isEmpty())
 {
 GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","You cannot remove *all* the video\n"));
@@ -641,16 +659,18 @@
 ListOfSegments tmp=segments;
 
 _SEGMENT *first=getSegment(startSeg);
+ _VIDEOS *vid=getRefVideo(first->_reference);
+ uint64_t padding=vid->timeIncrementInUs/2;
 // shorten the start segment
- first->_durationUs=startOffset;
+ first->_durationUs=startOffset+padding;
 // remove following segments
 int n=segments.size();
 for(int i=startSeg+1;i<n;i++)
 {
 segments.erase(segments.begin()+startSeg+1);
 }
- updateStartTime();
 removeEmptySegments();
+ updateStartTime();
 if(isEmpty())
 {
 GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","You cannot remove *all* the video\n"));
@@ -789,7 +809,9 @@
 _SEGMENT *seg=getSegment(i);
 _VIDEOS *vid=this->getRefVideo(seg->_reference);
 if(seg->_durationUs==0) index=i;
- if(seg->_refStartTimeUs==0 && seg->_durationUs==vid->firstFramePts) index=i; 
+#ifndef ADM_ZERO_OFFSET
+ if(seg->_refStartTimeUs==0 && seg->_durationUs==vid->firstFramePts) index=i;
+#endif
 }
 if(index==-1) break;
 segments.erase(segments.begin()+index);
@@ -934,6 +956,9 @@
 newSegs.push_back(s);
 }
 segments=newSegs;
+ // If a video doesn't start at zero and we paste to its first frame,
+ // we end up with an empty segment at the beginning. Remove it.
+ removeEmptySegments();
 updateStartTime();
 dump();
 return true;

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp Changed

@@ -18,14 +18,11 @@
 #include "ADM_cpp.h"
 #include "ADM_default.h"
 #include "A_functions.h"
-#include "ADM_audioFilterInterface.h"
-#include "audioEncoderApi.h"
-#include "ADM_muxerProto.h"
 #include "GUI_ui.h"
-#include "ADM_coreVideoFilterFunc.h"
 
 #include "fourcc.h"
 #include "ADM_edit.hxx"
+#include "ADM_edPtsDts.h"
 #include "DIA_coreToolkit.h"
 #include "prefs.h"
 
@@ -40,11 +37,22 @@
 { 
 int checkRange=100;
 _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
- int totalFrames=vid->_aviheader->getVideoStreamHeader()->dwLength;
+ vidHeader *hdr=vid->_aviheader;
+ int totalFrames=hdr->getVideoStreamHeader()->dwLength;
 
 if(checkRange>totalFrames) checkRange=totalFrames;
- goToTimeVideo(seg->_startTimeUs);
- 
+ uint64_t from=seg->_startTimeUs;
+ if(!seg->_refStartTimeUs && vid->firstFramePts)
+ from+=vid->firstFramePts;
+ if(!goToTimeVideo(from))
+ {
+ ADM_warning("Cannot navigate, cannot check file for broken PTS.\n");
+ return false;
+ }
+ vid->lastSentFrame=0;
+ vid->dontTrustBFramePts=false;
+ uint64_t inc=vid->timeIncrementInUs;
+
 stats.reset();
 ADM_info("Checking file for broken PTS...\n");
 ADM_info("Checking %d frames out of %d.\n",checkRange,totalFrames);
@@ -54,7 +62,7 @@
 DecodeNextPicture(seg->_reference);
 working->update(i,checkRange);
 }
- goToTimeVideo(seg->_startTimeUs);
+ goToTimeVideo(from);
 delete working;
 ADM_info("-------- Stats :----------\n");
 #define INFO(x) ADM_info(#x":%d\n",stats.x);
@@ -64,8 +72,162 @@
 INFO( nbNoImage);
 INFO( nbPtsgoingBack);
 ADM_info("-------- /Stats ----------\n");
- if(stats.nbPtsgoingBack>1)
+
+ if(!stats.nbBFrames && hdr->providePts()==false)
+ {
+ ADM_info("No B-frames and no PTS, setting PTS equal DTS\n");
+ return setPtsEqualDts(hdr,inc);
+ }
+
+ if(stats.nbPtsgoingBack>1 || (stats.nbBFrames && hdr->providePts()==false))
 {
+#ifdef WORK_AROUND_BAD_PTS
+ if(!GUI_Question(QT_TRANSLATE_NOOP("ADM_Composer",
+ "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?")))
+ {
+ vid->dontTrustBFramePts=true;
+ }else
+ {
+ std::vector<uint64_t> ListOfDts; // future PTS values
+ std::vector<uint64_t> ListOfPts; // identify the frame for a PTS from above
+ goToTimeVideo(from);
+ vid->lastSentFrame=0;
+ uint64_t bfdelay=2*inc; // FIXME B-frame delay
+ for(uint32_t i=0;i<totalFrames;i++)
+ {
+ uint64_t pts,dts;
+ hdr->getPtsDts(i,&pts,&dts);
+ if(dts==ADM_NO_PTS)
+ {
+ if(!i)
+ dts=0;
+ else
+ {
+ hdr->getPtsDts(i-1,&pts,&dts);
+ dts+=inc;
+ }
+ }
+ pts=dts;
+ hdr->setPtsDts(i,pts,dts);
+ }
+
+ DIA_workingBase *decoding=createWorking(QT_TRANSLATE_NOOP("ADM_Composer","Decoding video..."));
+ for(uint32_t i=0;i<totalFrames;i++)
+ {
+ if(false==decoding->isAlive())
+ {
+ vid->dontTrustBFramePts=true;
+ goToTimeVideo(from);
+ delete decoding;
+ return true;
+ }
+ decoding->update(i,totalFrames);
+
+ EditorCache *cache;
+ uint64_t pts,dts;
+ hdr->getPtsDts(i,&pts,&dts);
+ ListOfDts.push_back(dts);
+ //printf("adding %" PRIu64" ms to the list of DTS\n",dts/1000);
+
+ cache=vid->_videoCache;
+ ADMCompressedImage img;
+
+ img.data=compBuffer;
+ img.cleanup(vid->lastSentFrame);
+
+ uint32_t frame=vid->lastSentFrame;
+ vid->lastSentFrame++;
+ if(!hdr->getFrame(frame,&img))
+ {
+ ADM_warning("getFrame failed for frame %" PRIu32"\n",frame);
+ break;
+ }
+
+ ADMImage *pic;
+ pic=cache->getFreeImage();
+ if(!decompressImage(pic,&img,seg->_reference))
+ {
+ ADM_info("Decoding error for frame %" PRIu32"\n",frame);
+ }
+ if(dts!=ADM_NO_PTS && dts>vid->lastDecodedPts)
+ vid->lastDecodedPts=dts;
+ pts=pic->Pts; // used only to match the decoded frame to its source
+ if(pts==ADM_NO_PTS)
+ pts=vid->lastDecodedPts;
+ cache->invalidate(pic);
+ //printf("adding PTS %" PRIu64" ms to the list of reordered PTS\n",pts/1000);
+ ListOfPts.push_back(pts);
+ }
+ delete decoding;
+
+ uint32_t size=ListOfPts.size();
+ if(ListOfDts.size()<size)
+ size=ListOfDts.size();
+ for(uint32_t i=0; i<size; i++)
+ { // look up a nearby frame with matching DTS
+ uint64_t pts,dts;
+ int match=-1;
+ uint32_t lower=0;
+ if(i>16)
+ lower=i-16;
+ uint32_t upper=size;
+ if(size-i>16)
+ upper=i+16;
+ for(uint32_t j=lower;j<upper;j++)
+ {
+ hdr->getPtsDts(j,&pts,&dts);
+ if(dts==ADM_NO_PTS)
+ {
+ //printf("skipping frame %d\n",(int)j);
+ continue;
+ }
+ if(dts==ListOfPts.at(i))
+ {
+ match=j; // found the frame
+ //printf("frame %d matches %d, dts=%" PRIu64" ms\n",(int)i,match,dts/1000);
+ break;
+ }
+ }
+ if(match==-1)
+ {
+ ADM_warning("No match for PTS %" PRIu64" ms\n",ListOfPts.at(i)/1000);
+ continue;
+ }
+ hdr->getPtsDts(match,&pts,&dts);
+ pts=ListOfDts.at(i);
+ hdr->setPtsDts(match,pts,dts);
+ }
+
+ for(int i=0;i<totalFrames;i++)
+ { // add B-frame delay
+ uint64_t pts,dts;
+ hdr->getPtsDts(i,&pts,&dts);
+ if(pts!=ADM_NO_PTS)
+ pts+=bfdelay;
+ hdr->setPtsDts(i,pts,dts);
+ }
+
+ _segments.updateRefVideo();
+
+ int nbAudTracks=getNumberOfActiveAudioTracks();
+ for(int i=0; i<nbAudTracks; i++)
+ { // add the corresponding audio delay
+ bool enabled;
+ int ms=0;
+ getAudioShift(i,&enabled,&ms);
+ ms+=(int)(bfdelay/1000);
+ if(i==0)
+ UI_setTimeShift(true,ms);
+ ADM_info("Adding %d ms to audio delay for track %d, delay=%d ms\n",(int)(bfdelay/1000),i,ms);
+ setAudioShift(i,true,ms);
+ }
+
+ rewind();
+ return true;
+ }
+#else
 if(!GUI_Question(QT_TRANSLATE_NOOP("ADM_Composer","Some timing information are incorrect.\nIt happens with some capture software.\n"
 "If you re encode video we should drop these informations,\n else it will cause dropped frame/jerky video.\n"
 "If you just copy the video without reencoding,\n you should keep them.\n"
@@ -103,9 +265,9 @@
 }
 }
 ADM_info("Cancelled %d pts as unreliable \n",processed);
-
+#endif
 }
- goToTimeVideo(seg->_startTimeUs);
+ goToTimeVideo(from);
 return true;
 }
 /**
@@ -137,9 +299,10 @@
 bool ADM_Composer::checkForDoubledFps(vidHeader *hdr,uint64_t timeIncrementUs)
 { 
 int totalFrames=hdr->getVideoStreamHeader()->dwLength;
- int good=0,bad=0,skipped=0;
+ int good=0,bad=0;
 uint64_t dtsCeil= (timeIncrementUs*18)/10;
 std::vector<uint64_t> dtsList,ptsList;
+ std::vector<int> validDtsList,validPtsList;
 ADM_info("Checking for doubled FPS.., time increment ceiling = %d\n",(int)dtsCeil);
 for(int i=0;i<totalFrames;i++)
 {
@@ -147,9 +310,49 @@
 hdr->getPtsDts(i,&pts,&dts);
 
 if(dts!=ADM_NO_PTS)
+ {
 dtsList.push_back(dts);
+ validDtsList.push_back(i);
+ }
 if(pts!=ADM_NO_PTS)
- ptsList.push_back(pts); 
+ {
+ ptsList.push_back(pts);
+ validPtsList.push_back(i);
+ }
+ }
+ bool proceed=false;
+ if(validDtsList.size()>2)
+ {
+ for(int i=0;i<(validDtsList.size()-1);i++)
+ {
+ if(validDtsList[i+1]-validDtsList[i]==1)
+ {
+ proceed=true;
+ break; // got at least once two consecutive frames with valid DTS
+ }
+ }
+ }
+ if(!proceed)
+ {
+ ADM_info("No consecutive frames with valid DTS found, can't safely halve FPS\n");
+ return false;
+ }
+ proceed=false;
+ if(validPtsList.size()>2)
+ {
+ for(int i=0;i<(validPtsList.size()-1);i++)
+ {
+ if(validPtsList[i+1]-validPtsList[i]==1)
+ {
+ proceed=true;
+ break; // got at least once two consecutive frames with valid PTS
+ }
+ }
+ }
+ if(!proceed)
+ {
+ ADM_info("No consecutive frames with valid PTS found, can't safely halve FPS\n");
+ return false;
 }
 std::sort (dtsList.begin(), dtsList.end()); 
 std::sort (ptsList.begin(), ptsList.end());

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edMarker.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edMarker.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp Changed

@@ -40,6 +40,11 @@
 hdr->getVideoInfo(&info);
 uint32_t nbFrames=0;
 nbFrames=info.nb_frames;
+ if(!nbFrames)
+ {
+ ADM_warning("The demuxer reports zero frames in this video, can't verify DTS\n");
+ return false;
+ }
 //
 ADM_info("Verifying DTS....\n");
 uint64_t got_dts=0,startDts=0;
@@ -248,6 +253,7 @@
 if(!fail) return true; // Have all PTS, ok...
 ADM_info("Some PTS are missing, try to guess them...\n");
 fail=0;
+ bool interlaced=false;
 //
 for(int i=0;i<nbFrames-1;i+=1)
 {
@@ -263,6 +269,7 @@
 {
 continue;
 }
+ interlaced=true;
 // TOP / BOTTOM
 if(pts==ADM_NO_PTS)
 {
@@ -271,7 +278,7 @@
 }
 }
 ADM_info("H264 AVC scheme: %" PRIu32"/%" PRIu32" failures.\n",fail,nbFrames/2);
- if(fail) goto nextScheme;
+ if(!interlaced || fail) goto nextScheme;
 {
 ADM_info("Filling 2nd field PTS\n");
 uint32_t fixed=0;

avidemux_2.7.0.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp Changed

@@ -19,6 +19,8 @@
 #include "ADM_videoCopy.h"
 #include "ADM_edit.hxx"
 #include "ADM_coreUtils.h"
+#include "ADM_vidMisc.h"
+#include "prefs.h"
 extern ADM_Composer *video_body; // Fixme!
 
 #if 1
@@ -35,7 +37,8 @@
     aviInfo info;
     uint64_t ptsStart=startTime+1;
     uint64_t dtsStart;
-    ADM_info("Creating copy video stream, start time=%2.2f s\n",(float)startTime/1000000.);
+    ADM_info("Creating copy video stream, start time: %s\n",ADM_us2plain(startTime));
+    ADM_info("End time: %s\n",ADM_us2plain(endTime));
     video_body->getVideoInfo(&info);
     width=info.width;
     height=info.height;
@@ -50,22 +53,27 @@
         ptsStart=dtsStart=startTime;
     }else   
     {
+        uint64_t delta=0;
+        video_body->getPtsDtsDelta(ptsStart,&delta);
+        ADM_info("PTS/DTS delta=%" PRIu64" us\n",delta);
         // Do we have non droppable b frame ?
         uint32_t bframeDelay;
         if(true==video_body->getNonClosedGopDelay(ptsStart,&bframeDelay) && bframeDelay)
         {
-            ADM_info("Some B-frames are not droppable, increasing delay by %d us\n",bframeDelay);
-            videoDelay+=bframeDelay;
-        }
-        else
+            if(bframeDelay+2*frameIncrement>delta) // i.e. delta is wrong
+            {
+                bframeDelay+=2*(int)frameIncrement-(int)delta;
+                ADM_info("Some B-frames are not droppable, increasing delay by %d us\n",bframeDelay);
+                videoDelay+=bframeDelay;
+            }else
+            {
+                ADM_info("Some B-frames are not droppable, but PTS delay is sufficient\n");
+            }
+        }else
         {
             videoDelay=0;
         }
-        
-        uint64_t delta=0;
-        video_body->getPtsDtsDelta(ptsStart,&delta);
 
-        ADM_info("PTS/DTS delta=%" PRIu64" us\n",delta);
         //videoDelay
         if(delta>ptsStart)
         {
@@ -76,12 +84,14 @@
         {
             dtsStart=ptsStart-delta;
         }
+        endTime+=videoDelay;
         // Now search the DTS associated with it...
     }
     eofMet=false;
 
-  
-    
+    sanitizeDts=false;
+    prefs->get(FEATURES_COPY_MODE_SANITIZE_DTS, &sanitizeDts);
+
     this->startTimeDts=dtsStart;
     this->startTimePts=ptsStart;
     this->endTimePts=endTime;
@@ -140,7 +150,7 @@
     if(true==eofMet) return false;
 again:
     image.data=out->data;
-    if(false==video_body->getCompressedPicture(videoDelay,&image))
+    if(false==video_body->getCompressedPicture(videoDelay,sanitizeDts,&image))
     {
             ADM_warning("Get packet failed\n");
             return false;
@@ -187,7 +197,7 @@
 uint64_t        ADM_videoStreamCopy::getVideoDuration(void)
 {
     //return video_body->getVideoDuration();
-    return endTimePts-startTimePts;
+    return endTimePts-startTimeDts;
 }
 
 /**

avidemux_2.7.0.tar.gz/avidemux/common/ADM_preview.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_preview.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_previewNavigate.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_previewNavigate.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_render.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_render/GUI_render.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_toolkit/automation.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_toolkit/automation.cpp Changed

@@ -15,6 +15,7 @@
 ***************************************************************************/
 
 #include <math.h>
+#include <errno.h>
 #include "ADM_cpp.h"
 #include "ADM_assert.h"
 #include "avi_vars.h"
@@ -217,27 +218,41 @@
 */
 void call_scriptEngine(const char *scriptFile)
 {
+ char *fullpath=ADM_PathCanonize(scriptFile);
+ FILE *fd=ADM_fopen(fullpath,"r");
+ if(!fd)
+ {
+ if(errno == EACCES)
+ {
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm", "Permission Error"), QT_TRANSLATE_NOOP("adm", "Cannot open script \"%s\"."), fullpath);
+ }
+ if(errno == ENOENT)
+ {
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm", "File Error"), QT_TRANSLATE_NOOP("adm", "Script \"%s\" does not exist."), fullpath);
+ }
+ return;
+ }
+
 std::vector<IScriptEngine*> engines = getScriptEngines();
- 
 std::string root,ext;
- ADM_PathSplit(std::string(scriptFile),root,ext);
+ ADM_PathSplit(std::string(fullpath),root,ext);
 
- if (engines.size() == 1)
+ if(engines.size() == 1)
 {
- A_parseScript(engines[0], scriptFile);
- if(avifileinfo)
- {
+ A_parseScript(engines[0],fullpath);
+ if(avifileinfo)
+ {
 A_Rewind();
- UI_setMarkers(video_body->getMarkerAPts(),video_body->getMarkerBPts());
- }
- return;
+ UI_setMarkers(video_body->getMarkerAPts(),video_body->getMarkerBPts());
+ }
+ return;
 }
- 
+
 for (int i = 0; i < engines.size(); i++)
 {
 if (!engines[i]->defaultFileExtension().compare(ext))
 {
- A_parseScript(engines[i], scriptFile);
+ A_parseScript(engines[i],fullpath);
 A_Rewind();
 UI_setMarkers(video_body->getMarkerAPts(),video_body->getMarkerBPts());
 return;

avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoCodec/private_inc/ADM_ffmpeg_videotoolbox_internal.h Added

@@ -0,0 +1,30 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_hwAccel.h"
+
+#ifdef USE_VIDEOTOOLBOX
+
+/**
+ *  \class decoderFFVT
+ */
+
+class decoderFFVT : public ADM_acceleratedDecoderFF
+{
+public:
+                    bool        alive;
+                                decoderFFVT (AVCodecContext *avctx,decoderFF *parent);
+                                ~decoderFFVT();
+    virtual         bool        uncompress (ADMCompressedImage * in, ADMImage * out);
+    virtual const   char        *getName(void) {return "VideoToolbox";}
+                    //bool        markSurfaceUsed(ADM_VTSurface *s);
+                    //bool        markSurfaceUnused(ADM_VTSurface *s);
+};
+#endif
+//EOF

avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

@@ -446,16 +446,6 @@
 out->_noPicture = 1;
 out->Pts=ADM_COMPRESSED_NO_PTS;
 out->refType=ADM_HW_NONE;
- ADM_info("[LibVa] Nothing to decode -> no Picture\n");
- return false;
- }
-
-
- if (!in->dataLength )	// Null frame, silently skipped
- {
- out->_noPicture = 1;
- out->Pts=ADM_COMPRESSED_NO_PTS;
- out->refType=ADM_HW_NONE;
 ADM_info("[dxva] Nothing to decode -> no Picture\n");
 return false;
 }
@@ -475,16 +465,25 @@
 
 AVFrame *frame=_parent->getFramePointer();
 ADM_assert(frame);
- int ret = avcodec_decode_video2 (_context, frame, &got_picture, &pkt);
-
- if(ret<0)
+ if(_parent->getDrainingState())
 {
- char er[2048]={0};
- av_make_error_string(er, sizeof(er)-1, ret);
- ADM_warning("DXVA: Error %d in lavcodec (%s)\n",ret,er);
- out->refType=ADM_HW_NONE;
- return false;
+ if(_parent->getDrainingInitiated()==false)
+ {
+ avcodec_send_packet(_context, NULL);
+ _parent->setDrainingInitiated(true);
+ }
+ }else
+ {
+ avcodec_send_packet(_context, &pkt);
 }
+
+ int ret = avcodec_receive_frame(_context, frame);
+
+ if(!ret)
+ _parent->setEndOfStream(false);
+ if(!_parent->decodeErrorHandler(ret))
+ return false;
+
 if(frame->pict_type==AV_PICTURE_TYPE_NONE)
 {
 out->_noPicture=true;

avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

@@ -41,6 +41,7 @@
 
 
 static bool libvaWorking=true;
+static bool libvaEncoderWorking=false;
 static admMutex imageMutex;
 static int ADM_LIBVAgetBuffer(AVCodecContext *avctx, AVFrame *pic);
 static void ADM_LIBVAreleaseBuffer(struct AVCodecContext *avctx, AVFrame *pic);
@@ -102,7 +103,10 @@
 { 
 bool v=true;
 if(!libvaWorking) return false;
- if(!prefs->get(FEATURES_LIBVA,&v)) v=false;
+ if(!prefs->get(FEATURES_LIBVA,&v)) 
+ {
+ v=false;
+ }
 return v;
 }
 
@@ -127,8 +131,10 @@
 \fn libvaProbe
 \brief Try loading vaapi...
 */
+extern bool ADM_initLibVAEncoder(void);
 bool libvaProbe(void)
 {
+ ADM_info("Probing for libVA support...\n");
 GUI_WindowInfo xinfo;
 void *draw;
 draw=UI_getDrawWidget();
@@ -137,10 +143,19 @@
 {
 GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Core has been compiled without LIBVA support, but the application has been compiled with it.\nInstallation mismatch"));
 libvaWorking=false;
+ return false;
 }
 
 if(false==admLibVA::init(&xinfo)) return false;
 libvaWorking=true;
+ { // Only check encoder if decoder is working
+ libvaEncoderWorking = ADM_initLibVAEncoder();
+ 
+ }
+ if(libvaEncoderWorking) 
+ ADM_info("LIBVA HW encoder is working\n");
+ else 
+ ADM_info("LIBVA HW encoder is *NOT* working\n");
 return true;
 }
 
@@ -496,16 +511,25 @@
 
 AVFrame *frame=_parent->getFramePointer();
 ADM_assert(frame);
- int ret = avcodec_decode_video2 (_context, frame, &got_picture, &pkt);
- 
- if(ret<0)
+ if(_parent->getDrainingState())
 {
- char er[2048]={0};
- av_make_error_string(er, sizeof(er)-1, ret);
- ADM_warning("Error %d in lavcodec (%s)\n",ret,er);
- out->refType=ADM_HW_NONE;
- return false;
+ if(_parent->getDrainingInitiated()==false)
+ {
+ avcodec_send_packet(_context, NULL);
+ _parent->setDrainingInitiated(true);
+ }
+ }else
+ {
+ avcodec_send_packet(_context, &pkt);
 }
+
+ int ret = avcodec_receive_frame(_context, frame);
+
+ if(!ret)
+ _parent->setEndOfStream(false);
+ if(!_parent->decodeErrorHandler(ret))
+ return false;
+
 if(frame->pict_type==AV_PICTURE_TYPE_NONE)
 {
 out->_noPicture=true;
@@ -599,6 +623,7 @@
 return false;
 break;
 }
+ break;
 #endif 
 case AV_CODEC_ID_VC1: profile= VAProfileVC1Advanced;break;
 #ifdef LIBVA_VP9_DEC
@@ -635,7 +660,7 @@
 */
 bool initLIBVADecoder(void)
 {
- ADM_info("Registering LIBVA hw decocer\n");
+ ADM_info("Registering LIBVA hw decoder\n");
 ADM_hwAccelManager::registerDecoder(&libvaEntry);
 return true;
 }

avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp Added

@@ -0,0 +1,267 @@
+/***************************************************************************
+    \file       ADM_ffmpeg_videotoolbox.cpp
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_cpp.h"
+#include "ADM_default.h"
+
+#ifdef USE_VIDEOTOOLBOX
+extern "C" {
+#include "libavcodec/avcodec.h"
+#include "libavcodec/videotoolbox.h"
+#include "libavutil/pixdesc.h"
+}
+
+#include "ADM_codec.h"
+#include "ADM_ffmp43.h"
+#include "ADM_hwAccel.h"
+#include "ADM_image.h"
+#include "ADM_coreVideoToolbox.h"
+#include "prefs.h"
+#include "../private_inc/ADM_ffmpeg_videotoolbox_internal.h"
+
+extern "C"
+{
+static enum AVPixelFormat ADM_VT_getFormat(struct AVCodecContext *avctx, const enum AVPixelFormat *fmt)
+{
+    int i;
+    ADM_info("[VideoToolbox]: GetFormat\n");
+    AVCodecID id=AV_CODEC_ID_NONE;
+    AVPixelFormat c;
+    AVPixelFormat outPix;
+    for(i=0;fmt[i]!=AV_PIX_FMT_NONE;i++)
+    {
+        c=fmt[i];
+        char name[300]={0};
+        av_get_pix_fmt_string(name,sizeof(name),c);
+        ADM_info("[VideoToolbox]: Evaluating PIX_FMT %d,%s\n",c,name);
+        av_get_codec_tag_string(name,sizeof(name),avctx->codec_id);
+        ADM_info("\t  Evaluating codec %d,%s\n",avctx->codec_id,name);
+        if(c!=AV_PIX_FMT_VIDEOTOOLBOX) continue;
+#define FMT_V_CHECK(x,y) case AV_CODEC_ID_##x: outPix=AV_PIX_FMT_VIDEOTOOLBOX; id=avctx->codec_id; break;
+
+        switch(avctx->codec_id)
+        {
+            FMT_V_CHECK(H264,H264)
+            FMT_V_CHECK(H265,H265) // requires ffmpeg >= 3.4
+#if 0
+            FMT_V_CHECK(MPEG1VIDEO,MPEG1)
+            FMT_V_CHECK(MPEG2VIDEO,MPEG2) // check succeeds, hw decoder init fails
+#endif
+            FMT_V_CHECK(VC1,VC1)
+            default:
+                ADM_info("No hw support for format %d\n",avctx->codec_id);
+                continue;
+                break;
+        }
+        break;
+    }
+    if(id==AV_CODEC_ID_NONE)
+    {
+        return AV_PIX_FMT_NONE;
+    }
+    // Finish intialization of VideoToolbox decoder
+    const AVHWAccel *accel=ADM_acceleratedDecoderFF::parseHwAccel(outPix,id,AV_PIX_FMT_VIDEOTOOLBOX);
+    if(accel)
+    {
+        ADM_info("Found matching hw accelerator : %s\n",accel->name);
+        ADM_info("Successfully setup hw accel\n");
+        return AV_PIX_FMT_VIDEOTOOLBOX;
+    }
+    return AV_PIX_FMT_NONE;
+}
+}
+
+/**
+    \fn ctor
+*/
+decoderFFVT::decoderFFVT(struct AVCodecContext *avctx, decoderFF *parent) : ADM_acceleratedDecoderFF(avctx,parent)
+{
+    AVCodecID codecID;
+    const char *name="";
+    alive = false;
+
+    switch(_context->codec_id)
+    {
+        case AV_CODEC_ID_HEVC:
+            name="h265";
+            break;
+        case AV_CODEC_ID_H264:
+            name="h264";
+            break;
+        case AV_CODEC_ID_MPEG1VIDEO:
+        case AV_CODEC_ID_MPEG2VIDEO:
+            name="mpegvideo";
+            break;
+        case AV_CODEC_ID_VC1:
+            name="vc1";
+            break;
+        default:
+            ADM_warning("codec not in the list\n");
+            break;
+    }
+    if(admCoreVideoToolbox::initVideoToolbox(avctx))
+    {
+        ADM_error("VideoToolbox init failed\n");
+        return;
+    }
+    alive = true;
+    ADM_info("Successfully setup hw accel\n");
+}
+/**
+    \fn dtor
+*/
+decoderFFVT::~decoderFFVT()
+{
+    ADM_info("Destroying VideoToolbox decoder\n");
+}
+/**
+    \fn uncompress
+*/
+bool decoderFFVT::uncompress(ADMCompressedImage *in, ADMImage *out)
+{
+    if(!in->dataLength ) // Null frame, silently skipped
+    {
+        out->_noPicture = 1;
+        out->Pts=ADM_COMPRESSED_NO_PTS;
+        ADM_info("[VideoToolbox] Nothing to decode -> no picture\n");
+        return true;
+    }
+
+    out->Pts=in->demuxerPts;
+    _context->reordered_opaque=in->demuxerPts;
+
+    AVFrame *frame=_parent->getFramePointer();
+    ADM_assert(frame);
+    AVPacket pkt;
+    av_init_packet(&pkt);
+    pkt.data=in->data;
+    pkt.size=in->dataLength;
+    if(in->flags&AVI_KEY_FRAME)
+        pkt.flags=AV_PKT_FLAG_KEY;
+    else
+        pkt.flags=0;
+
+    if(_parent->getDrainingState())
+    {
+        if(_parent->getDrainingInitiated()==false)
+        {
+            avcodec_send_packet(_context, NULL);
+            _parent->setDrainingInitiated(true);
+        }
+    }else
+    {
+        avcodec_send_packet(_context, &pkt);
+    }
+
+    int ret = avcodec_receive_frame(_context, frame);
+
+    if(!ret)
+        _parent->setEndOfStream(false);
+    if(!_parent->decodeErrorHandler(ret))
+        return false;
+
+    if(frame->pict_type==AV_PICTURE_TYPE_NONE)
+    {
+        out->_noPicture=true;
+        out->Pts = (uint64_t)(frame->reordered_opaque);
+        ADM_info("[VideoToolbox] No picture \n");
+        return false;
+    }
+
+    int result=admCoreVideoToolbox::copyData(_context, frame, out);
+    if(result)
+    {
+        ADM_error("copying hw image failed, return value was %d\n",result);
+        return false;
+    }
+
+    out->Pts = (uint64_t)(frame->reordered_opaque);
+    out->flags = admFrameTypeFromLav(frame);
+    out->refType=ADM_HW_NONE;
+
+    return true;
+}
+
+
+class ADM_hwAccelEntryVideoToolbox : public ADM_hwAccelEntry
+{
+public: 
+                        ADM_hwAccelEntryVideoToolbox();
+     virtual bool       canSupportThis( struct AVCodecContext *avctx, const enum AVPixelFormat *fmt, enum AVPixelFormat &outputFormat );
+     virtual            ADM_acceleratedDecoderFF *spawn( struct AVCodecContext *avctx, const enum AVPixelFormat *fmt );
+     virtual            ~ADM_hwAccelEntryVideoToolbox() {};
+};
+/**
+ * 
+ */
+ADM_hwAccelEntryVideoToolbox::ADM_hwAccelEntryVideoToolbox()
+{
+    name="VideoToolbox";
+}
+/**
+ * 
+ * @param avctx
+ * @param fmt
+ * @param outputFormat
+ * @return 
+ */
+bool ADM_hwAccelEntryVideoToolbox::canSupportThis( struct AVCodecContext *avctx, const enum AVPixelFormat *fmt, enum AVPixelFormat &outputFormat )
+{
+    bool enabled=true;
+    prefs->get(FEATURES_VIDEOTOOLBOX,&enabled);
+    if(!enabled)
+    {
+        ADM_info("VideoToolbox not enabled\n");
+        return false;
+    }
+
+    enum AVPixelFormat ofmt=ADM_VT_getFormat(avctx,fmt);
+    if(ofmt==AV_PIX_FMT_NONE)
+        return false;
+    outputFormat=ofmt;
+    ADM_info("Assuming that this is supported by VideoToolbox\n");
+    return true;
+}
+
+ADM_acceleratedDecoderFF *ADM_hwAccelEntryVideoToolbox::spawn( struct AVCodecContext *avctx, const enum AVPixelFormat *fmt )
+{
+    decoderFF *ff=(decoderFF *)avctx->opaque;
+    decoderFFVT *dec=new decoderFFVT(avctx,ff);
+    if(!dec->alive)
+        return NULL;
+
+    return (ADM_acceleratedDecoderFF *)dec;
+}
+
+bool videotoolboxProbe(void)
+{
+    return true; // FIXME
+}
+
+bool admVideoToolbox_exitCleanup(void)
+{
+    return true; // FIXME
+}
+
+static ADM_hwAccelEntryVideoToolbox videoToolboxEntry;
+
+/**
+ *
+ */
+bool initVideoToolboxDecoder(void)
+{
+    ADM_info("Registering VideoToolbox hw decoder\n");
+    ADM_hwAccelManager::registerDecoder(&videoToolboxEntry);
+    return true;
+}
+#endif
+// EOF

avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoCodec/src/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoCodec/src/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoEncoder/src/ADM_dynVideoEncoder.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoEncoder/src/ADM_dynVideoEncoder.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp Changed

@@ -45,6 +45,7 @@
 virtual void setCoupledConf(CONFcouple *couples);
 virtual bool configure(void) ; /// Start graphical user interface
 virtual uint64_t getAbsoluteStartTime(void) ; /// Return the absolute offset of the current frame. Used to display time of for filter
+ virtual bool getTimeRange(uint64_t *start, uint64_t *end); // Get the time a partialized filter is active
 virtual bool goToTime(uint64_t usSeek); // needed for seekable preview when reconfiguring a partialized filter
 };
 friend class trampolineFilter;
@@ -72,11 +73,11 @@
 virtual bool getNextFrameForSon(uint32_t *fn,ADMImage *image); /// Return the next image
 virtual bool getCoupledConf(CONFcouple **couples) ; /// Return the current filter configuration
 virtual void setCoupledConf(CONFcouple *couples);
- virtual bool configure(void);
- virtual bool goToTime(uint64_t usSeek); /// Start graphical user interface
+ virtual bool configure(void); /// Start graphical user interface
+ virtual bool getRange(uint64_t *start, uint64_t *end);
+ virtual bool goToTime(uint64_t usSeek);
 static void reconfigureCallback(void *cookie);
 void reconfigureSon();
-
 };
 
 // Add the hook to make it valid plugin
@@ -124,6 +125,15 @@
 {
 ADM_assert(0);
 }
+ // sanity check
+ if(configuration.endBlack < configuration.startBlack)
+ {
+ uint32_t swap=configuration.startBlack;
+ configuration.startBlack=configuration.endBlack;
+ configuration.endBlack=swap;
+ }
+ if(configuration.endBlack > info.totalDuration)
+ configuration.endBlack=info.totalDuration;
 // Ok, create trampoline & son
 trampoline=new trampolineFilter(this,NULL);
 // Create swallowed filter
@@ -221,20 +231,37 @@
 */
 bool partialFilter::isInRange(uint64_t tme)
 {
- if(tme<(1000LL*configuration.startBlack) || (tme>configuration.endBlack*1000LL))
- {
- return false;
- }
- return true;
+ uint64_t first=previousFilter->getAbsoluteStartTime();
+ uint64_t from=1000LL*configuration.startBlack;
+ uint64_t to=1000LL*configuration.endBlack;
+
+ if(tme+first<from || tme+first>to)
+ {
+ return false;
+ }
+ return true;
 }
+
+/**
+ \fn getRange
+ \fn Get the time a partialized filter should be active
+*/
+bool partialFilter::getRange(uint64_t *startTme, uint64_t *endTme)
+{
+ *startTme=1000LL*configuration.startBlack;
+ *endTme=1000LL*configuration.endBlack;
+ return true;
+}
+
 /**
 */
 bool partialFilter::goToTime(uint64_t usSeek)
 {
- bool r=previousFilter->goToTime(usSeek);
- sonFilter->goToTime(usSeek);
- byPass=!isInRange(usSeek);
- return r;
+ bool r=previousFilter->goToTime(usSeek);
+ byPass=!isInRange(usSeek);
+ if(!byPass)
+ sonFilter->goToTime(usSeek);
+ return r;
 }
 
 /**
@@ -248,6 +275,15 @@
 sonFilter->getCoupledConf(&newParam);
 if(newParam)
 {
+ if(configuration.startBlack > configuration.endBlack)
+ {
+ uint32_t swap=configuration.startBlack;
+ configuration.startBlack=configuration.endBlack;
+ configuration.endBlack=swap;
+ }
+ if(configuration.endBlack > info.totalDuration)
+ configuration.endBlack=info.totalDuration;
+
 *couples=new CONFcouple(newParam->getSize()+3);
 (*couples)->writeAsString("filterName",configuration.filterName.c_str());
 (*couples)->writeAsUint32("startBlack",configuration.startBlack);
@@ -303,9 +339,9 @@
 */
 bool partialFilter::configure( void)
 {
- uint32_t mx=9*3600*1000;
- diaElemTimeStamp start(&(configuration.startBlack),QT_TRANSLATE_NOOP("partial","Start time (ms):"),0,mx);
- diaElemTimeStamp end(&(configuration.endBlack),QT_TRANSLATE_NOOP("partial","End time (ms):"),0,mx);
+ uint32_t mx=(uint32_t)(previousFilter->getInfo()->totalDuration/1000);
+ diaElemTimeStamp start(&(configuration.startBlack),QT_TRANSLATE_NOOP("partial","_Start time:"),0,mx);
+ diaElemTimeStamp end(&(configuration.endBlack),QT_TRANSLATE_NOOP("partial","_End time:"),0,mx);
 diaElemButton son(QT_TRANSLATE_NOOP("partial", "Configure filter"), partialFilter::reconfigureCallback,this);
 
 diaElem *elems[3]={&start,&end,&son};
@@ -348,6 +384,11 @@
 return previousFilter->getAbsoluteStartTime(); // never called
 }
 
+bool partialFilter::trampolineFilter::getTimeRange(uint64_t *start, uint64_t *end)
+{
+ return ((partialFilter *)previousFilter)->getRange(start,end);
+}
+
 bool partialFilter::trampolineFilter::goToTime(uint64_t usSeek)
 {
 partialFilter *p=(partialFilter *)previousFilter;

avidemux_2.7.0.tar.gz/avidemux/common/A_functions.h -> avidemux_2.7.1.tar.gz/avidemux/common/A_functions.h Changed

avidemux_2.7.0.tar.gz/avidemux/common/adm_main.h -> avidemux_2.7.1.tar.gz/avidemux/common/adm_main.h Changed

avidemux_2.7.0.tar.gz/avidemux/common/gui_action.names -> avidemux_2.7.1.tar.gz/avidemux/common/gui_action.names Changed

avidemux_2.7.0.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -52,6 +52,7 @@
 admMutex singleThread;
 
 float currentZoom=ZOOM_1_1;
+static bool cutsNotOnIntraWarned;
 #include "DIA_audioTracks.h"
 //***********************************
 //******** A Function ***************
@@ -303,7 +304,11 @@
 case ACT_AUDIO_FILTERS:
 {
 EditableAudioTrack *ed=video_body->getDefaultEditableAudioTrack();
- if(ed) ed->audioEncodingConfig.audioFilterConfigure();
+ if(ed)
+ {
+ ed->audioEncodingConfig.audioFilterConfigure();
+ UI_setTimeShift(ed->audioEncodingConfig.shiftEnabled,ed->audioEncodingConfig.shiftInMs);
+ }
 }
 return;
 case ACT_PREFERENCES:
@@ -497,7 +502,6 @@
 video_body->addToUndoQueue();
 A_ResetMarkers();
 A_Resync();
- GUI_setCurrentFrameAndTime();
 break;
 }
 case ACT_Copy:
@@ -544,6 +548,18 @@
 {
 video_body->pasteFromClipBoard(currentPts);
 }
+ if(!UI_getCurrentVCodec() && !video_body->checkCutsAreOnIntra())
+ {
+ 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?")))
+ {
+ video_body->undo();
+ cutsNotOnIntraWarned=false;
+ break;
+ }
+ cutsNotOnIntraWarned=true;
+ }
 video_body->getVideoInfo (avifileinfo);
 d=video_body->getVideoDuration()-d;
 if(markA>currentPts)
@@ -561,7 +577,6 @@
 GUI_GoToTime(currentPts);
 }
 break;
- break;
 
 case ACT_Undo:
 case ACT_Redo:
@@ -597,6 +612,7 @@
 video_body->getVideoInfo (avifileinfo);
 
 A_Resync();
+ A_Rewind();
 A_ResetMarkers();
 
 // forget last project file
@@ -610,27 +626,47 @@
 uint64_t a=video_body->getMarkerAPts();
 uint64_t b=video_body->getMarkerBPts();
 uint64_t current=video_body->getCurrentFramePts();
+ uint64_t before=video_body->getVideoDuration();
 if(a>b)
 {
 uint64_t p=a;
 a=b;
 b=p;
 }
+ // Special case of B being at or beyond the last frame
+ bool lastFrame=false;
+ if(b==before)
+ {
+ lastFrame=true;
+ }else
+ {
+ uint64_t pts=video_body->getLastKeyFramePts();
+ if(pts!=ADM_NO_PTS && b>=pts) // don't waste time if B is before the last keyframe
+ {
+ GUI_infiniteForward(pts);
+ uint64_t lastFramePts=video_body->getCurrentFramePts();
+ if(b>=lastFramePts) lastFrame=true; // B is at or beyond the last frame
+ }
+ }
+ if(!a && lastFrame)
+ {
+ if(action==ACT_Cut)
+ {
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Cutting"),
+ QT_TRANSLATE_NOOP("adm","It is impossible to cut out the entire video. Please recheck the position of markers A and B."));
+ }else
+ {
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Deleting"),
+ QT_TRANSLATE_NOOP("adm","It is impossible to delete the entire video. Please recheck the position of markers A and B."));
+ }
+ break;
+ }
 if(action==ACT_Cut)
 {
 video_body->copyToClipBoard(a,b);
 }
 video_body->addToUndoQueue();
- // Special case of B being at or beyond the last frame
- bool lastFrame=false;
 bool result=false;
- uint64_t pts=video_body->getLastKeyFramePts();
- if(pts!=ADM_NO_PTS && b>=pts) // don't waste time if B is before the last keyframe
- {
- GUI_infiniteForward(pts);
- uint64_t lastFramePts=video_body->getCurrentFramePts();
- if(b>=lastFramePts) lastFrame=true; // B is at or beyond the last frame
- }
 if(lastFrame)
 result= video_body->truncate(a);
 else
@@ -640,20 +676,60 @@
 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))
+ {
+ const char *alert;
+ 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?");
+ }
+ if(!GUI_Question(alert))
+ {
+ video_body->undo();
+ cutsNotOnIntraWarned=false;
+ break;
+ }
+ cutsNotOnIntraWarned=true;
+ }
 A_ResetMarkers();
 A_Resync(); // total duration & stuff
- 
+
+ // If A was at the first frame of a segment with start time in ref = 0 and ref video
+ // not starting at zero, the part of the segment before the first frame got deleted too,
+ // even if we didn't ask for that explicitely. We must adjust timestamps accordingly
+ // to avoid seek errors. This is not relevant for truncating.
+ uint64_t after=video_body->getVideoDuration();
+ uint64_t c=0;
+ if(!lastFrame)
+ c=before-after+a-b;
 if(current>=a) // else current is before A, so nothing to do
 {
 if(current<b) // current is between A & B => A
 {
- current=a;
+ current=a-c;
 }else // current is after the removed chunk, adjust
 {
- current-=(b-a);
+ current-=b-a+c;
 }
- } 
- GUI_GoToTime(current);
+ }
+ if(!video_body->goToTimeVideo(current))
+ {
+ // If seek fails, we may crash in admPreview::samePicture()
+ // due to _currentSegment and _currentPts going out of sync.
+ // Rewind to get on firm ground again.
+ A_Rewind();
+ }else
+ {
+ admPreview::samePicture();
+ GUI_setCurrentFrameAndTime();
+ }
 }
 break;
 // set decoder option (post processing ...)
@@ -699,6 +775,7 @@
 char *longname;
 uint32_t magic[4];
 uint32_t id = 0;
+ cutsNotOnIntraWarned = false;
 
 if (playing)
 return 0;
@@ -1485,22 +1562,25 @@
 if (avifileinfo) // already opened ?
 { // delete everything
 // if preview is on
- admPreview::setMainDimension(0, 0, ZOOM_1_1);
 if(getPreviewMode()!=ADM_PREVIEW_NONE)
 {
 admPreview::stop();
 setPreviewMode(ADM_PREVIEW_NONE);
 }
+ admPreview::setMainDimension(0, 0, ZOOM_1_1); // destroy preview
 UI_setNeedsResizingFlag(false);
+ uint32_t zero[6]={0};
+ UI_setVUMeter(zero);
 delete avifileinfo;
 //delete wavinfo;
- admPreview::destroy();
 avifileinfo = NULL;
 video_body->clearUndoQueue();
 video_body->cleanup ();
-
+ UI_setAudioTrackCount(0);
+ UI_setTimeShift(false,0);
 // filterCleanUp ();
 UI_setTitle(NULL);
+ UI_setDecoderName("XXXX");
 
 A_ResetMarkers();
 ReSync();

avidemux_2.7.0.tar.gz/avidemux/common/gui_navigate.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/gui_navigate.cpp Changed

@@ -415,13 +415,9 @@
 */
 void GUI_setAllFrameAndTime(void)
 {
-    //UI_updateFrameCount(video_body->getCurrentFrame());
-    UI_setCurrentTime(admPreview::getCurrentPts());
     UI_setTotalTime(video_body->getVideoDuration());
-
     // progress bar
-    GUI_SetScale(0);
-
+    GUI_setCurrentFrameAndTime(0);
 }
 
 /**
@@ -516,7 +512,20 @@
 bool GUI_infiniteForward(uint64_t pts)
 {
     admPreview::deferDisplay(1);
-    GUI_GoToTime(pts);
+    if(false==video_body->goToTimeVideo(pts))
+    {
+        ADM_warning("Seek to %s failed, retrying from the previous keyframe\n",ADM_us2plain(pts));
+        // work around a possible inability to decode keyframe at pts
+        uint64_t tmp=pts;
+        if(!video_body->getPKFramePTS(&tmp))
+            return false;
+        ADM_info("Retrying from keyframe at %s\n",ADM_us2plain(tmp));
+        if(false==video_body->goToTimeVideo(tmp))
+        {
+            ADM_error("Seek to the penultimate keyframe failed as well, giving up\n",ADM_us2plain(tmp));
+            return false;
+        }
+    }
     while(admPreview::nextPicture())
     {
     }

avidemux_2.7.0.tar.gz/avidemux/common/gui_play.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/gui_play.cpp Changed

@@ -51,8 +51,9 @@
 {
 private:
 AUDMAudioFilter *playbackAudio;
- Clock ticktock;
- uint32_t nbSamplesSent ;
+ Clock ticktock,tocktick;
+ bool refreshCapEnabled;
+ uint32_t refreshCapValue;
 float *wavbuf ;
 uint64_t firstPts,lastPts;
 uint64_t vuMeterPts;
@@ -70,6 +71,7 @@
 public:
 bool run(void);
 bool initialize(void);
+ uint64_t getLastPts(void) { return lastPts; }
 GUIPlayback();
 ~GUIPlayback();
 
@@ -108,7 +110,7 @@
 
 uint32_t framelen,flags;
 uint32_t max,err;
- uint64_t oldTimeFrame;
+ uint64_t oldTimeFrame,newTimeFrame;
 aviInfo info;
 float oldZoom=admPreview::getCurrentZoom();
 video_body->getVideoInfo(&info);
@@ -138,7 +140,7 @@
 GUIPlayback *playLoop=new GUIPlayback;
 playLoop->initialize();
 playLoop->run();
-
+ newTimeFrame=oldTimeFrame+playLoop->getLastPts();
 delete playLoop;
 playing = 0;
 
@@ -153,12 +155,14 @@
 // In copy mode, we can keep the current position
 if(getPreviewMode()!=ADM_PREVIEW_NONE)
 admPreview::seekToTime(oldTimeFrame);
- UI_purge();
- 
- admPreview::samePicture();
- GUI_setCurrentFrameAndTime();
- UI_purge();
-
+ else
+ {
+ if(false==admPreview::seekToTime(newTimeFrame))
+ admPreview::samePicture();
+ }
+ UI_purge();
+ GUI_setCurrentFrameAndTime();
+ UI_purge();
 
 }
 /**
@@ -205,6 +209,11 @@
 */
 bool GUIPlayback::initialize(void)
 {
+ refreshCapEnabled=false;
+ refreshCapValue=0;
+ prefs->get(FEATURES_CAP_REFRESH_ENABLED,&refreshCapEnabled);
+ prefs->get(FEATURES_CAP_REFRESH_VALUE,&refreshCapValue);
+
 firstPts=admPreview::getCurrentPts();
 if(getPreviewMode()==ADM_PREVIEW_NONE) // copy
 {
@@ -243,8 +252,10 @@
 uint32_t movieTime;
 uint32_t systemTime;
 uint32_t fn;
+ bool gotAudio=true;
 int refreshCounter=0;
 ticktock.reset();
+ tocktick.reset();
 vuMeterPts=0;
 ADMImage *previewBuffer=admPreview::getBuffer();
 ADM_HW_IMAGE hwImageFormat=admPreview::getPreferedHwImageFormat();
@@ -252,17 +263,28 @@
 do
 {
 
- admPreview::displayNow();;
- GUI_setCurrentFrameAndTime(firstPts);
+ admPreview::displayNow();
+ if(refreshCapEnabled)
+ {
+ if(stop_req || tocktick.getElapsedMS()>refreshCapValue)
+ {
+ GUI_setCurrentFrameAndTime(firstPts);
+ tocktick.reset();
+ }
+ }else
+ {
+ GUI_setCurrentFrameAndTime(firstPts);
+ }
+ lastPts=admPreview::getCurrentPts();
 if(false==videoFilter->getNextFrameAs(hwImageFormat,&fn,previewBuffer))
 {
 printf("[Play] Cancelling playback, nextPicture failed\n");
 break;
 }
- audioPump(false);
- lastPts=admPreview::getCurrentPts();
+ if(gotAudio)
+ gotAudio=audioPump(false);
 systemTime = ticktock.getElapsedMS();
- movieTime=(uint32_t)((lastPts-firstPts*0)/1000);
+ movieTime=(uint32_t)(lastPts/1000);
 movieTime+=audioLatency;
 //printf("[Playback] systemTime: %lu movieTime : %lu audioLatency=%lu \r",systemTime,movieTime,(uint32_t)audioLatency);
 //printf("[LastPTS]=%s \n",ADM_us2plain(lastPts));
@@ -295,12 +317,15 @@
 
 if(delta>10)
 {
- if(playbackAudio)
- audioPump(true);
+ if(gotAudio)
+ gotAudio=audioPump(true);
 else
 ADM_usleep(10*1000);
 }else
- audioPump(false);
+ {
+ if(gotAudio)
+ gotAudio=audioPump(false);
+ }
 
 UI_purge();
 refreshCounter=0;
@@ -322,15 +347,15 @@
 
 bool GUIPlayback::audioPump(bool wait)
 {
+ if (!playbackAudio)
+ return false;
+
 uint32_t oaf = 0;
 uint32_t load = 0;
 uint8_t channels;
 uint32_t fq;
 static bool errorMet=false;
 
- if (!playbackAudio)	 return false;
-
-
 channels= playbackAudio->getInfo()->channels;
 fq=playbackAudio->getInfo()->frequency;
 uint32_t slice=(fq * channels)/50; // 20 ms
@@ -347,6 +372,8 @@
 AUD_Status status;
 if (! (oaf = playbackAudio->fill(slice, wavbuf,&status)))
 {
+ if(status==AUD_END_OF_STREAM)
+ return false;
 if(errorMet==false)
 ADM_warning("[Playback] Error reading audio stream...\n");
 errorMet=true;
@@ -354,7 +381,6 @@
 }
 errorMet=false;
 AVDM_AudioPlay(wavbuf, oaf);
- nbSamplesSent += oaf/channels;
 load+=oaf;
 }
 updateVu();
@@ -401,9 +427,7 @@
 AUD_Status status;
 small_ = playbackAudio->fill(channels, wavbuf,&status);
 fill+=small_;
- // Call it twice to be sure it is properly setup
- state = AVDM_AudioSetup(frequency, channels ,playbackAudio->getChannelMapping());
- AVDM_AudioClose();
+
 state = AVDM_AudioSetup(frequency, channels ,playbackAudio->getChannelMapping());
 latency=AVDM_GetLayencyMs();
 printf("[Playback] Latency : %d ms\n",latency);
@@ -414,6 +438,7 @@
 cleanupAudio();
 return false;
 }
+ UI_setVolume();
 while(fill<preload)
 {
 if (!(small_ = playbackAudio->fill(preload-fill, wavbuf+fill,&status)))
@@ -422,7 +447,6 @@
 }
 fill+=small_;
 }
- nbSamplesSent = fill/channels; // In sample
 AVDM_AudioPlay(wavbuf, fill);
 // Let audio latency sets in...
 ticktock.reset();

avidemux_2.7.0.tar.gz/avidemux/common/gui_save.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/gui_save.cpp Changed

@@ -35,6 +35,7 @@
 #include "DIA_factory.h"
 #include "ADM_coreJobs.h"
 #include "ADM_audioWrite.h"
+#include "ADM_filterChain.h"
 // Local prototypes
 #include "A_functions.h"
 #include "ADM_script2/include/ADM_script.h"
@@ -111,7 +112,13 @@
 const char *defaultExtension="jpg";
 GUI_FileSelWriteExtension (QT_TRANSLATE_NOOP("adm","Select JPEG to Save"),defaultExtension,(SELFILE_CB *)A_saveJpg); // A_saveJpg);
 }
- 	break;
+ break;
+ case ACT_SAVE_PNG:
+ {
+ const char *defaultExtension="png";
+ GUI_FileSelWriteExtension (QT_TRANSLATE_NOOP("adm","Select PNG to Save"),defaultExtension,(SELFILE_CB *)A_savePng);
+ }
+ break;
 //----------------------test-----------------------
 case ACT_SAVE_VIDEO:
 {
@@ -313,25 +320,93 @@
 }
 
 /**
- \fn A_saveJpg
- \brief Save a Jpg image from current display buffer
+
 */
-int A_saveJpg (const char *name)
+static ADMImage *getCurrentFilteredImage(void)
 {
- uint8_t fl;
- ADMImage *image=admPreview::getBuffer();
+ uint64_t current=admPreview::getCurrentPts();
+ // resync last sent frame & stuff
+ admPreview::deferDisplay(true);
+ video_body->rewind();
+ admPreview::seekToTime(current);
+ admPreview::deferDisplay(false);
+
+ uint64_t end=video_body->getVideoDuration();
+ ADM_HW_IMAGE hw=admPreview::getPreferedHwImageFormat();
+ ADM_videoFilterChain *chain;
+ chain=NULL;
+ ADM_coreVideoFilter *filter;
+ filter=NULL;
+
+ chain=createVideoFilterChain(current,end);
+ if(!chain)
+ {
+ ADM_error("Cannot create video filter chain\n");
+ return NULL;
+ }
+
+ filter=chain->back();
+ FilterInfo *info=filter->getInfo();
+ uint32_t width=info->width;
+ uint32_t height=info->height;
+ ADMImage *image=new ADMImageDefault(width,height);
 if(!image)
 {
- printf("[SaveJpeg] No image\n");
- return false;
+ ADM_error("No buffer\n");
+ destroyVideoFilterChain(chain);
+ chain=NULL;
+ filter=NULL;
+ return NULL;
+ }
 
+ uint32_t fn;
+ if(!filter->getNextFrameAs(hw,&fn,image))
+ {
+ ADM_error("No image\n");
+ delete image;
+ image=NULL;
 }
- if(!image->saveAsJpg (name))
+
+ destroyVideoFilterChain(chain);
+ chain=NULL;
+ filter=NULL;
+
+ // resync last sent frame & stuff again
+ admPreview::deferDisplay(true);
+ video_body->rewind();
+ admPreview::seekToTime(current);
+ admPreview::deferDisplay(false);
+
+ return image;
+}
+
+/**
+ \fn A_saveJpg
+ \brief Save a Jpg image from current display buffer
+*/
+bool A_saveJpg (const char *name)
+{
+ bool result=true;
+ bool fromDisplayBuffer=false;
+ if(getPreviewMode()==ADM_PREVIEW_NONE)
+ fromDisplayBuffer=true;
+ ADMImage *image;
+ image=NULL;
+ if(fromDisplayBuffer)
+ image=admPreview::getBuffer();
+ else
+ image=getCurrentFilteredImage();
+ if(!image || !image->saveAsJpg(name))
 {
- GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Jpeg"),QT_TRANSLATE_NOOP("adm","Fail to save as jpeg"));
- return false;
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Jpeg"),QT_TRANSLATE_NOOP("adm","Failed to save as JPEG"));
+ result=false;
+ }
+ if(!fromDisplayBuffer)
+ {
+ delete image;
+ image=NULL;
 }
- return true ;
+ return result;
 }
 
 
@@ -342,67 +417,156 @@
 */
 int A_saveBunchJpg(const char *name)
 {
- ADMImage *src=NULL;
- uint32_t curImg;
- char	 fullName[2048],*ext;
- char *baseName;
- DIA_workingBase *working;
- uint8_t success=0;
-
- ADM_error("Broken\n");
- return 0;
-#if 0
+ int success=0;
+ uint64_t original=admPreview::getCurrentPts();
+ uint64_t start=video_body->getMarkerAPts();
+ uint64_t end=video_body->getMarkerBPts();
+ if(start>end)
+ {
+ uint64_t swap=end;
+ end=start;
+ start=swap;
+ }
+ uint64_t inc=video_body->getFrameIncrement();
+ uint64_t pts=0;
+ ADM_HW_IMAGE hw=admPreview::getPreferedHwImageFormat();
+
+ ADM_videoFilterChain *chain;
+ if(getPreviewMode()==ADM_PREVIEW_NONE)
+ chain=createEmptyVideoFilterChain(start,end);
+ else
+ chain=createVideoFilterChain(start,end);
+ if(!chain)
+ {
+ ADM_error("Cannot create video filter chain\n");
+ return 0;
+ }
 
- // Split name into base + extension
- ADM_PathSplit(name,&baseName,&ext);
+ ADM_coreVideoFilter *filter;
+ filter=chain->back();
+ FilterInfo *info=filter->getInfo();
+ uint32_t width=info->width;
+ uint32_t height=info->height;
+ ADMImage *src=new ADMImageDefault(width,height);
+ if(!src)
+ {
+ ADM_error("No buffer\n");
+ destroyVideoFilterChain(chain);
+ chain=NULL;
+ filter=NULL;
+ return 0;
+ }
+
+ admPreview::deferDisplay(true);
+ admPreview::seekToTime(start);
+
+ char fullName[2048];
+ std::string baseName,ext;
+ uint32_t range=(uint32_t)((end-start)/1000);
+ uint32_t fn;
+ DIA_workingBase *working;
 
- src=new ADMImageDefault(avifileinfo->width,avifileinfo->height);
- ADM_assert(src);
+ // Split name into base + extension
+ ADM_PathSplit(std::string(name),baseName,ext);
 
- working=createWorking(QT_TRANSLATE_NOOP("adm","Saving as set of jpegs"));
- for(curImg=frameStart;curImg<=frameEnd;curImg++)
+ working=createWorking(QT_TRANSLATE_NOOP("adm","Saving selection as set of JPEG images"));
+ while(true)
+ {
+ if(!filter->getNextFrameAs(hw,&fn,src))
 {
- working->update(curImg-frameStart,frameEnd-frameStart);
- if (!GUI_getFrameContent (src,curImg ))
- {
- GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Cannot decode frame"), QT_TRANSLATE_NOOP("adm","Aborting."));
- goto _bunch_abort;
- }
- if(!working->isAlive()) goto _bunch_abort;
- sprintf(fullName,"%s%04d.jpg",baseName,curImg-frameStart);
- if(!src->saveAsJpg(fullName)) goto _bunch_abort;
+ //GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Cannot decode frame"), QT_TRANSLATE_NOOP("adm","Aborting."));
+ break;
 }
- success=1;
-
-_bunch_abort:
- if(success)
- GUI_Info_HIG(ADM_LOG_INFO,QT_TRANSLATE_NOOP("adm","Done"),QT_TRANSLATE_NOOP("adm", "Saved %d images."), curImg-frameStart);
+ if(src->Pts==ADM_NO_PTS)
+ pts+=inc;
 else
- GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm", "Could not save all images."));
- delete working	;
- delete src;
- return success;
-#endif
+ pts=src->Pts;
+ pts/=1000;
+ working->update((uint32_t)pts,range);
+ success++;
+ if(!working->isAlive()) break;
+ sprintf(fullName,"%s-%04d.jpg",baseName.c_str(),success);
+ if(!src->saveAsJpg(fullName)) break;
+ if(success==9999)
+ {
+ GUI_Info_HIG(ADM_LOG_INFO,QT_TRANSLATE_NOOP("adm","Warning"),QT_TRANSLATE_NOOP("adm","Maximum number of 9999 images reached, aborting."));
+ break;
+ }
+ }
+
+ if(success)
+ GUI_Info_HIG(ADM_LOG_INFO,QT_TRANSLATE_NOOP("adm","Done"),QT_TRANSLATE_NOOP("adm","Saved %d images."),success);
+ else
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Saving images failed."));
+ delete working;
+ working=NULL;
+ delete src;
+ src=NULL;
+ destroyVideoFilterChain(chain);
+ chain=NULL;
+ filter=NULL;
+
+ admPreview::seekToTime(original);
+ admPreview::deferDisplay(false);
+ return success;
+}
 
+/**
+ \fn A_savePng
+ \brief Save a PNG image from current display buffer or from filter chain
+*/
+bool A_savePng (const char *name)
+{
+ bool result=true;
+ bool fromDisplayBuffer=false;
+ if(getPreviewMode()==ADM_PREVIEW_NONE)
+ fromDisplayBuffer=true;
+ ADMImage *image;
+ image=NULL;
+ if(fromDisplayBuffer)
+ image=admPreview::getBuffer();
+ else
+ image=getCurrentFilteredImage();
+ if(!image || !image->saveAsPng(name))
+ {
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","PNG"),QT_TRANSLATE_NOOP("adm","Failed to save as PNG"));
+ result=false;
+ }
+ if(!fromDisplayBuffer)
+ {
+ delete image;
+ image=NULL;
+ }
+ return result;
 }
+
 /**
 \fn A_saveImg
 \brief Save current displayed image as a BMP file
 */
-int A_saveImg (const char *name)
+bool A_saveImg (const char *name)
 {
- ADMImage *image=admPreview::getBuffer();
- if(!image)
+ bool result=true;
+ bool fromDisplayBuffer=false;
+ if(getPreviewMode()==ADM_PREVIEW_NONE)
+ fromDisplayBuffer=true;
+ ADMImage *image;
+ image=NULL;
+ if(fromDisplayBuffer)
+ image=admPreview::getBuffer();
+ else
+ image=getCurrentFilteredImage();
+ if(!image || !image->saveAsBmp(name))
 {
- ADM_warning("[SaveBmp] No image\n");
- return 0;
-
- }
- int r=image->saveAsBmp(name);
- if(!r)
 GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","BMP op failed"),QT_TRANSLATE_NOOP("adm", "Saving %s as a BMP file failed."), ADM_getFileName(name).c_str());
- return r;
-
+ result=false;
+ }
+ if(!fromDisplayBuffer)
+ {
+ delete image;
+ image=NULL;
+ }
+ return result;
 }
 
 /**

avidemux_2.7.0.tar.gz/avidemux/common/gui_savenew.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/gui_savenew.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/main.cpp -> avidemux_2.7.1.tar.gz/avidemux/common/main.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/common/xpm/adm.ico -> avidemux_2.7.1.tar.gz/avidemux/common/xpm/adm.ico Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt Changed

@@ -2,14 +2,14 @@
 SET(ADM_LIB ADM_UI${QT_LIBRARY_EXTENSION}6)
 
 ADM_QT_WRAP_CPP(${ADM_LIB}_source
-	T_bitrate.h  T_button.h  T_dialogFactory.h  T_filesel.h  T_menu.h  T_slider.h
-	T_threadCount.h  T_toggle.h  T_notch.h
+        T_bitrate.h  T_button.h  T_dialogFactory.h  T_filesel.h  T_menu.h  T_slider.h
+        T_threadCount.h  T_timeStamp.h  T_toggle.h  T_notch.h
         ../include/DIA_flyDialogQt4.h
 )
 
 SET(${ADM_LIB}_T
-	T_bitrate.cpp  T_button.cpp  T_dialogFactory.cpp  T_filesel.cpp  T_menu.cpp
-	T_slider.cpp  T_threadCount.cpp  T_toggle.cpp  T_notch.cpp
+        T_bitrate.cpp  T_button.cpp  T_dialogFactory.cpp  T_filesel.cpp  T_menu.cpp
+        T_slider.cpp  T_threadCount.cpp  T_timeStamp.cpp  T_toggle.cpp  T_notch.cpp
         DIA_flyDialog.cpp
         T_QCanvas.cpp
         T_qtFactory.cpp
@@ -22,9 +22,9 @@
 endif(USE_OPENGL)
 
 SET(${ADM_LIB}_SRCS
-	FAC_bar.cpp    FAC_frame.cpp  FAC_integer.cpp  FAC_aspectRatio.cpp
-	FAC_float.cpp  FAC_hex.cpp    FAC_readOnlyText.cpp  toolkit.cpp FAC_timeStamp.cpp
-	FAC_matrix.cpp  DIA_none.cpp  ${${ADM_LIB}_source}  ${${ADM_LIB}_T})
+        FAC_bar.cpp    FAC_frame.cpp  FAC_integer.cpp  FAC_aspectRatio.cpp
+        FAC_float.cpp  FAC_hex.cpp    FAC_readOnlyText.cpp  toolkit.cpp
+        FAC_matrix.cpp  DIA_none.cpp  ${${ADM_LIB}_source}  ${${ADM_LIB}_T})
 
 add_compiler_export_flags()
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR})

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp Changed

@@ -15,6 +15,32 @@
 #include "ADM_default.h"
 #include "DIA_flyDialogQt4.h"
 
+class transparentSizeGrip : public QSizeGrip
+{
+public:
+    transparentSizeGrip(QWidget *parent) : QSizeGrip(parent) { };
+    ~transparentSizeGrip() { };
+private:
+    void paintEvent(QPaintEvent *event);
+};
+
+/**
+    \fn paintEvent
+*/
+void transparentSizeGrip::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    painter.setPen(Qt::NoPen);
+    QColor color(Qt::black);
+    color.setAlpha(0);
+    QBrush invisible = QBrush(color, Qt::SolidPattern);
+    painter.fillRect(rect(),invisible);
+    painter.end();
+}
+
+/**
+
+*/
 ADM_QRubberBand::ADM_QRubberBand(QWidget *parent) : QRubberBand(QRubberBand::Rectangle, parent)
 {
 }
@@ -37,10 +63,28 @@
     painter.setPen(pen);
     QRect adjustedRect = rect().adjusted(1,1,-1,-1);
     painter.drawRect(adjustedRect);
-    color.setAlpha(80);
+    color.setAlpha(50);
     QBrush brush = QBrush(color, Qt::DiagCrossPattern);
     adjustedRect = adjustedRect.adjusted(1,1,-1,-1);
     painter.fillRect(adjustedRect, brush);
+
+    QPainterPath topLeft;
+    topLeft.moveTo(4,4);
+    topLeft.lineTo(12,4);
+    topLeft.lineTo(4,12);
+    topLeft.lineTo(4,4);
+
+    QPainterPath bottomRight;
+    bottomRight.moveTo(width()-4,height()-4);
+    bottomRight.lineTo(width()-12,height()-4);
+    bottomRight.lineTo(width()-4,height()-12);
+    bottomRight.lineTo(width()-4,height()-4);
+
+    painter.setPen(Qt::NoPen);
+    QBrush solid = QBrush(Qt::red, Qt::SolidPattern);
+    painter.fillPath(topLeft, solid);
+    painter.fillPath(bottomRight, solid);
+
     painter.end();
 }
 
@@ -55,13 +99,10 @@
     setWindowFlags(Qt::SubWindow);
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
-    QSizeGrip *grip1 = new QSizeGrip(this);
-    QSizeGrip *grip2 = new QSizeGrip(this);
-#ifdef __APPLE__
-    // work around grips not shown on macOS
+    transparentSizeGrip *grip1 = new transparentSizeGrip(this);
+    transparentSizeGrip *grip2 = new transparentSizeGrip(this);
     grip1->setFixedSize(10,10);
     grip2->setFixedSize(10,10);
-#endif
     grip1->setVisible(true);
     grip2->setVisible(true);
     layout->addWidget(grip1, 0, Qt::AlignLeft | Qt::AlignTop);

avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_UIs/src/T_timeStamp.cpp Added

@@ -0,0 +1,303 @@
+/***************************************************************************
+ FAC_timeStamp.cpp
+ Handle dialog factory element : timestamp
+ (C) 2006 Mean Fixounet@free.fr 
+***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_vidMisc.h"
+#include "T_timeStamp.h"
+
+extern const char *shortkey(const char *);
+
+namespace ADM_Qt4Factory
+{
+/**
+ * \class diaElemTimeStamp
+ * \brief Qt4 version of diaElemTimeStamp
+ */
+class diaElemTimeStamp : public diaElem,QtFactoryUtils
+{
+protected :
+ uint32_t valueMin;
+ uint32_t valueMax;
+public:
+ diaElemTimeStamp(uint32_t *v, const char *toggleTitle, const uint32_t vmin, const uint32_t vmax);
+ virtual ~diaElemTimeStamp();
+ void setMe(void *dialog, void *opaque, uint32_t line);
+ void getMe(void);
+ int getRequiredLayout(void);
+};
+
+/**
+ * \fn diaElemTimeStamp
+ * @param percent
+ * @param toggleTitle
+ */
+diaElemTimeStamp::diaElemTimeStamp(uint32_t *v, const char *toggleTitle, const uint32_t vmin, const uint32_t vmax)
+ : diaElem(ELEM_TIMESTAMP), QtFactoryUtils(toggleTitle)
+{
+ param=v;
+ valueMin=vmin;
+ valueMax=vmax;
+}
+/**
+ * \fn diaElemTimeStamp
+ * \brief dtor
+ */
+diaElemTimeStamp::~diaElemTimeStamp()
+{
+ ADM_QTimeStamp *w=(ADM_QTimeStamp *)myWidget;
+ myWidget=NULL;
+ if(w) delete w;
+}
+
+/**
+ \fn updateRange
+*/
+void ADM_QTimeStamp::updateRange(int i)
+{
+ uint32_t hh1,mm1,ss1,msec1;
+ uint32_t hh2,mm2,ss2,msec2;
+ ms2time(_min,&hh1,&mm1,&ss1,&msec1);
+ ms2time(_max,&hh2,&mm2,&ss2,&msec2);
+
+ myTWidget->hours->setRange(hh1,hh2);
+ myTWidget->minutes->setRange(0,59);
+ myTWidget->seconds->setRange(0,59);
+ myTWidget->mseconds->setRange(0,999);
+
+ uint32_t hh=myTWidget->hours->value();
+ uint32_t mm=myTWidget->minutes->value();
+ uint32_t ss=myTWidget->seconds->value();
+ uint32_t ms=myTWidget->mseconds->value();
+
+ if(hh==hh2)
+ {
+ myTWidget->minutes->setMaximum(mm2);
+ if(mm>=mm2)
+ {
+ myTWidget->seconds->setMaximum(ss2);
+ if(ss>=ss2)
+ {
+ myTWidget->mseconds->setMaximum(msec2);
+ }
+ }
+ }
+
+ if(hh==hh1)
+ {
+ myTWidget->minutes->setMinimum(mm1);
+ if(mm<=mm1)
+ {
+ myTWidget->seconds->setMinimum(ss1);
+ if(ss<=ss1)
+ {
+ myTWidget->mseconds->setMinimum(msec1);
+ }
+ }
+ }
+
+ bool hoursEnabled, minutesEnabled, secondsEnabled, msecondsEnabled;
+ hoursEnabled=minutesEnabled=secondsEnabled=msecondsEnabled=true;
+
+ if(!hh2)
+ {
+ hoursEnabled=false;
+ if(!mm2)
+ {
+ minutesEnabled=false;
+ if(!ss2)
+ {
+ secondsEnabled=false;
+ if(!msec2)
+ {
+ msecondsEnabled=false;
+ }
+ }
+ }
+ }
+
+ myTWidget->hours->setEnabled(hoursEnabled);
+ myTWidget->minutes->setEnabled(minutesEnabled);
+ myTWidget->seconds->setEnabled(secondsEnabled);
+ myTWidget->mseconds->setEnabled(msecondsEnabled);
+}
+
+/**
+ \fn setSelectionAndBuddy
+*/
+void ADM_QTimeStamp::setSelectionAndBuddy(QLabel *label)
+{
+#define BUDDY(x) if(label) label->setBuddy(myTWidget->x);
+ if(myTWidget->hours->isEnabled())
+ {
+ BUDDY(hours)
+ myTWidget->hours->selectAll();
+ }else
+ {
+ if(myTWidget->minutes->isEnabled())
+ {
+ BUDDY(minutes)
+ myTWidget->minutes->selectAll();
+ }else
+ {
+ if(myTWidget->seconds->isEnabled())
+ {
+ BUDDY(seconds)
+ myTWidget->seconds->selectAll();
+ }else
+ {
+ if(myTWidget->mseconds->isEnabled())
+ {
+ BUDDY(mseconds)
+ myTWidget->mseconds->selectAll();
+ }
+ }
+ }
+ }
+}
+
+/**
+ \fn ctor
+*/
+ADM_QTimeStamp::ADM_QTimeStamp(QString title, QWidget *dialog, QGridLayout *grid, uint32_t min, uint32_t max, uint32_t time, uint32_t line)
+{
+ myTWidget=new myTimeWidget;
+ myTWidget->hours=new fixedNumDigitsSpinBox(dialog);
+ myTWidget->minutes=new fixedNumDigitsSpinBox(dialog);
+ myTWidget->seconds=new fixedNumDigitsSpinBox(dialog);
+ myTWidget->mseconds=new fixedNumDigitsSpinBox(dialog);
+
+ myTWidget->mseconds->numDigits=3;
+
+ QLabel *textSemicolon1=new QLabel(":");
+ QLabel *textSemicolon2=new QLabel(":");
+ QLabel *textComma=new QLabel(",");
+
+ myTWidget->hours->setSuffix(QT_TRANSLATE_NOOP("timestamp"," h"));
+ myTWidget->minutes->setSuffix(QT_TRANSLATE_NOOP("timestamp"," m"));
+ myTWidget->seconds->setSuffix(QT_TRANSLATE_NOOP("timestamp"," s"));
+
+ myTWidget->hours->setAlignment(Qt::AlignRight);
+ myTWidget->minutes->setAlignment(Qt::AlignRight);
+ myTWidget->seconds->setAlignment(Qt::AlignRight);
+ myTWidget->mseconds->setAlignment(Qt::AlignRight);
+
+ QLabel *text=new QLabel(title, dialog);
+ text->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+ _min=min;
+ _max=max;
+ updateRange(0);
+
+ uint32_t hh,mm,ss,msec;
+ ms2time(time,&hh,&mm,&ss,&msec);
+
+ myTWidget->hours->setValue(hh);
+ myTWidget->minutes->setValue(mm);
+ myTWidget->seconds->setValue(ss);
+ myTWidget->mseconds->setValue(msec);
+
+ setSelectionAndBuddy(text);
+
+ QObject::connect(myTWidget->hours, SIGNAL(valueChanged(int)), this, SLOT(updateRange(int)));
+ QObject::connect(myTWidget->minutes, SIGNAL(valueChanged(int)), this, SLOT(updateRange(int)));
+ QObject::connect(myTWidget->seconds, SIGNAL(valueChanged(int)), this, SLOT(updateRange(int)));
+ QObject::connect(myTWidget->mseconds, SIGNAL(valueChanged(int)), this, SLOT(updateRange(int)));
+
+ QHBoxLayout *hboxLayout = new QHBoxLayout();
+ QSpacerItem *spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+ hboxLayout->addWidget(myTWidget->hours);
+ hboxLayout->addWidget(textSemicolon1);
+
+ hboxLayout->addWidget(myTWidget->minutes);
+ hboxLayout->addWidget(textSemicolon2);
+
+ hboxLayout->addWidget(myTWidget->seconds);
+
+ hboxLayout->addWidget(textComma);
+ hboxLayout->addWidget(myTWidget->mseconds);
+
+ hboxLayout->addItem(spacer);
+
+ grid->addWidget(text,line,0);
+ grid->addLayout(hboxLayout,line,1);
+}
+
+/**
+ \fn getTime
+*/
+uint32_t ADM_QTimeStamp::getTime(void)
+{
+ uint32_t hh=myTWidget->hours->value();
+ uint32_t mm=myTWidget->minutes->value();
+ uint32_t ss=myTWidget->seconds->value();
+ uint32_t ms=myTWidget->mseconds->value();
+
+ uint32_t time=hh*3600*1000+mm*60*1000+ss*1000+ms;
+
+ return time;
+}
+
+/**
+ * \fn setMe
+ * \brief construct UI to display editable timestamp
+ * @param dialog
+ * @param opaque
+ * @param line
+ */
+void diaElemTimeStamp::setMe(void *dialog, void *opaque, uint32_t line)
+{
+ uint32_t ms=*(uint32_t *)param;
+ if(ms < valueMin)
+ ms=valueMin;
+ if(ms > valueMax)
+ ms=valueMax;
+ QGridLayout *layout=(QGridLayout*) opaque;
+ ADM_QTimeStamp *stamp=new ADM_QTimeStamp(myQtTitle,(QWidget *)dialog,layout,valueMin,valueMax,ms,line);
+ myWidget=(void *)stamp;
+}
+
+/**
+ * \fn getMe
+ * \brief retrieve value from UI
+ */
+void diaElemTimeStamp::getMe(void)
+{
+ ADM_QTimeStamp *widget=(ADM_QTimeStamp *)myWidget;
+ uint32_t valueInMs=widget->getTime();
+ *(uint32_t *)param=valueInMs;
+}
+
+int diaElemTimeStamp::getRequiredLayout(void) { return FAC_QT_GRIDLAYOUT; }
+} // nameapsce
+/**
+ * \fn qt4CreateTimeStamp
+ * @param v
+ * @param toggleTitle
+ * @param vmin
+ * @param vmax
+ * @return 
+ */
+diaElem *qt4CreateTimeStamp(uint32_t *v, const char *toggleTitle, const uint32_t vmin, const uint32_t vmax)
+{
+ return new ADM_Qt4Factory::diaElemTimeStamp(v,toggleTitle,vmin,vmax);
+}
+void qt4DestroyTimeStamp(diaElem *e)
+{
+ ADM_Qt4Factory::diaElemTimeStamp *a=(ADM_Qt4Factory::diaElemTimeStamp *)e;
+ delete a;
+}
+//
+//EOF

avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_UIs/src/T_timeStamp.h Added

@@ -0,0 +1,64 @@
+#ifndef T_TIMESTAMP_H
+#define T_TIMESTAMP_H
+
+#include <QSpinBox>
+#include <QLabel>
+#include <QGridLayout>
+
+#include "DIA_factory.h"
+#include "ADM_dialogFactoryQt4.h"
+
+/**
+ * \class fixedNumDigitsSpinBox
+ * \brief Custom spinbox with leading zeros
+ */
+class fixedNumDigitsSpinBox : public QSpinBox
+{
+public:
+ int numDigits;
+ fixedNumDigitsSpinBox(QWidget *parent) : QSpinBox(parent)
+ {
+ numDigits=2;
+ }
+
+ virtual QString textFromValue(int value) const
+ {
+ return QString("%1").arg(value, numDigits, 10, QChar('0'));
+ }
+};
+
+/**
+ * \struct myTimeWidget
+ */
+typedef struct
+{
+ fixedNumDigitsSpinBox *hours;
+ fixedNumDigitsSpinBox *minutes;
+ fixedNumDigitsSpinBox *seconds;
+ fixedNumDigitsSpinBox *mseconds;
+}myTimeWidget;
+
+namespace ADM_Qt4Factory
+{
+/**
+ \class ADM_QTimeStamp
+*/
+class ADM_QTimeStamp : public QWidget
+{
+ Q_OBJECT
+
+protected :
+ uint32_t _min;
+ uint32_t _max;
+ myTimeWidget *myTWidget;
+ void setSelectionAndBuddy(QLabel *label);
+
+public:
+ ADM_QTimeStamp(QString title, QWidget *dialog, QGridLayout *grid, uint32_t min, uint32_t max, uint32_t time, uint32_t line);
+ uint32_t getTime(void);
+
+public slots:
+ void updateRange(int i);
+};
+} // end of namespace
+#endif

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp Changed

@@ -4,15 +4,40 @@
 
 #include "ADM_toolkitQt.h"
 #include "ADM_assert.h"
+#include "ADM_default.h"
 
 static QStack<QWidget*> widgetStack;
 
 void qtRegisterDialog(QWidget *dialog)
 {
-	if (widgetStack.count())
-		dialog->setParent(widgetStack.top(), Qt::Dialog);
-
-	widgetStack.push(dialog);
+ if (widgetStack.count())
+ {
+ Qt::WindowFlags flags = dialog->windowFlags();
+ 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
+ }
+ widgetStack.push(dialog);
 }
 
 void qtUnregisterDialog(QWidget *dialog)

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp Changed

@@ -17,7 +17,11 @@
 #include "ADM_coreJobs.h"
 #include "DIA_coreToolkit.h"
 #include <QtCore/QDir>
+#include <QAction>
 
+extern void loadTranslator(void);
+extern void initTranslator(void);
+extern void destroyTranslator(void);
 
 static QTableWidgetItem *fromText(const string &t,int id)
 {
@@ -164,13 +168,19 @@
 connect(ui.pushButtonRunAll,SIGNAL(pressed()),this,SLOT(runAllJob()));
 connect(ui.pushButtonCleanup,SIGNAL(pressed()),this,SLOT(cleanup()));
 
+ QAction *bye = new QAction(QString("Quit"),this);
+ bye->setShortcut(Qt::Key_Q | Qt::CTRL);
+ connect(bye,SIGNAL(triggered()),this,SLOT(quit()));
+ this->addAction(bye);
+
 // Start our socket
- if(false==mySocket.createBindAndAccept(&localPort))
+ localPort=0;
+ if(false==mySocket.createBindAndAccept(&localPort))
 {
 popup("Cannot bind socket");
 exit(-1);
 }
- ADM_info("Socket bound to %d\n",(int)localPort);
+ ADM_info("Socket bound to %" PRIu32"\n",localPort);
 //ADM_socket *n=mySocket.waitForConnect(5000);
 refreshList();
 dialog=NULL;
@@ -196,13 +206,14 @@
 */
 bool jobRun(int ac,char **av)
 {
-
+ initTranslator();
 QApplication *app=new QApplication(ac,av,0);
 Q_INIT_RESOURCE(jobs);
+ loadTranslator();
 jobWindow *jWindow=new jobWindow();
 
-
 jWindow->exec();
+ destroyTranslator();
 delete jWindow;
 delete app;
 return true;

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_jobs/src/uiJobs.ui -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_jobs/src/uiJobs.ui Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp Changed

@@ -24,36 +24,44 @@
 
 Ui_aboutWindow::Ui_aboutWindow(QWidget* parent) : QDialog(parent)
 {
-	Q_INIT_RESOURCE(about);
+ Q_INIT_RESOURCE(about);
 
-	ui.setupUi(this);
+ ui.setupUi(this);
 
-	connect(ui.licenseButton, SIGNAL(clicked(bool)), this, SLOT(licenseButton_clicked(bool)));
+ connect(ui.licenseButton, SIGNAL(clicked(bool)), this, SLOT(licenseButton_clicked(bool)));
 
-	char subversion[128]={0};
+ char subversion[128]={0};
+ const char *compiler="";
+#ifdef WIN32
+ #ifdef _MSC_VER
+ compiler="-VC++";
+ #else
+ compiler="-Gcc";
+ #endif
+#endif
 #if defined(ADM_SUBVERSION)
- sprintf(subversion,"%s (%s-fflibs %s)", ADM_VERSION, ADM_SUBVERSION, ADM_FFMPEG_VERSION);
+ sprintf(subversion,"%s (%s-fflibs %s%s)", ADM_VERSION, ADM_SUBVERSION, ADM_FFMPEG_VERSION,compiler);
 #else
 sprintf(subversion,"%s - Release",ADM_VERSION);
 #endif
 QString sv(subversion);
- ui.versionLabel->setTextFormat(Qt::RichText);
-	ui.versionLabel->setText(ui.versionLabel->text() + sv);
+ ui.versionLabel->setTextFormat(Qt::RichText);
+ ui.versionLabel->setText(ui.versionLabel->text() + sv);
 }
 
 void Ui_aboutWindow::licenseButton_clicked(bool)
 {
-	DIA_license();
+ DIA_license();
 }
 
 uint8_t DIA_about(void)
 {
-	Ui_aboutWindow dialog(qtLastRegisteredDialog());
-	qtRegisterDialog(&dialog);
+ Ui_aboutWindow dialog(qtLastRegisteredDialog());
+ qtRegisterDialog(&dialog);
 
-	dialog.exec();
+ dialog.exec();
 
-	qtUnregisterDialog(&dialog);
+ qtUnregisterDialog(&dialog);
 
-	return 1;
+ return 1;
 }

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp Changed

@@ -14,7 +14,7 @@
 #include "Q_audioTrackClass.h"
 #include "ADM_audioFilterInterface.h"
 #include "DIA_fileSel.h"
-
+#include "ADM_last.h"
 
 /**
 \fn audioTrackQt4
@@ -37,9 +37,8 @@
 }
 // create windows
 window=new audioTrackWindow();
- qtRegisterDialog(window);
 window->setModal(true);
- 
+
 languages=ADM_getLanguageList();
 nbLanguage=ADM_getLanguageListSize();
 
@@ -74,9 +73,8 @@
 this,SLOT(languagesClicked(int))); 
 * */ 
 }
- // 
- window->show();
- //
+ // set the parent and show the window
+ qtRegisterDialog(window);
 };
 /**
 * \fn setLanguageFromPool
@@ -131,9 +129,18 @@
 // start fileselector
 #define MAX_SOURCE_LENGTH 1024
 char fileName[MAX_SOURCE_LENGTH];
- if(!FileSel_SelectRead(QT_TRANSLATE_NOOP("qaudiotracks","Select audio file"),fileName,MAX_SOURCE_LENGTH-1,NULL))
+ std::string lastFolder;
+ admCoreUtils::getLastReadFolder(lastFolder);
+ if(!FileSel_SelectRead(QT_TRANSLATE_NOOP("qaudiotracks","Select audio file"),fileName,MAX_SOURCE_LENGTH-1,lastFolder.c_str()))
 {
 ADM_info("No file selected as audioTrack\n");
+ if(thisIndex>0)
+ {
+ me->blockSignals(true);
+ me->setCurrentIndex(thisIndex-1);
+ me->blockSignals(false);
+ return;
+ }
 // deactivate me
 me->blockSignals(true);
 me->setCurrentIndex(-1);
@@ -141,12 +148,25 @@
 disable(dex); // just to be on the safe side..
 return;
 }
+ admCoreUtils::setLastReadFolder(std::string(fileName));
 
 ADM_edAudioTrackExternal *ext=create_edAudioExternal(fileName);
 if(!ext)
 {
 GUI_Error_HIG(QT_TRANSLATE_NOOP("qaudiotracks","Error"),QT_TRANSLATE_NOOP("qaudiotracks","Cannot use that file as audio track"));
- return ;
+ if(thisIndex>0)
+ {
+ me->blockSignals(true);
+ me->setCurrentIndex(thisIndex-1);
+ me->blockSignals(false);
+ }else
+ {
+ me->blockSignals(true);
+ me->setCurrentIndex(-1);
+ me->blockSignals(false);
+ disable(dex);
+ }
+ return;
 }
 int poolIndex=_pool->size();
 _pool->addInternalTrack(ext);
@@ -299,8 +319,8 @@
 for(int i=0;i<NB_MENU;i++)
 {
 if(window->enabled[i]->checkState()!=Qt::Checked) continue;
- ADM_info("Checking input %d for track %d\n",i);
 int trackIndex=window->inputs[i]->currentIndex();
+ ADM_info("Checking input %d for track %d\n",trackIndex,i);
 if(trackIndex>=_pool->size()) 
 {
 ADM_warning("Referencing a non existing track in pool (%d/%d)\n",trackIndex,_pool->size());
@@ -486,6 +506,7 @@
 // -- language --
 // now add codecs
 int nbAud=audioEncoderGetNumberOfEncoders();
+ window->codec[dex]->clear();
 window->codec[dex]->addItem(QString(QT_TRANSLATE_NOOP("qaudiotracks","copy")));
 	for(uint32_t i=1;i<nbAud;i++)
 	{

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp Changed

@@ -16,6 +16,8 @@
 
 #include "Q_props.h"
 #include "avi_vars.h"
+#include "ADM_edAudioTrackExternal.h"
+#include "ADM_edAudioTrackFromVideo.h"
 #include "ADM_vidMisc.h"
 #include "ADM_toolkitQt.h"
 #include "ADM_coreUtils.h"
@@ -114,10 +116,26 @@
 
         FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), wavinfo->frequency);
 
-        duration=st->getDurationInUs();
+        duration=0;
+        EditableAudioTrack *ed=video_body->getDefaultEditableAudioTrack();
+        if(ed)
+        {
+            ADM_EDAUDIO_TRACK_TYPE type=ed->edTrack->getTrackType();
+            switch (type)
+            {
+                case ADM_EDAUDIO_FROM_VIDEO:
+                    duration=ed->edTrack->castToTrackFromVideo()->getDurationInUs();
+                    break;
+                case ADM_EDAUDIO_EXTERNAL:
+                    duration=ed->edTrack->castToExternal()->getDurationInUs();
+                    break;
+                default:break;
+            }
+        }
         ms2time(duration/1000,&hh,&mm,&ss,&ms);
         sprintf(text, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
         FILLQT_TRANSLATE_NOOP("qprops",labelAudioDuration);
+        ui.labelAudioDuration->setEnabled(!!duration);
 
 //                SET_YES(labelVBR,currentaudiostream->isVBR());
     } else

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui Changed

@@ -6,7 +6,7 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>437</width>
+ <width>520</width>
 <height>227</height>
 </rect>
 </property>
@@ -73,12 +73,6 @@
 </item>
 <item row="0" column="0">
 <widget class="QLabel" name="label_2">
- <property name="font">
- 
- <weight>75</weight>
- <bold>true</bold>
- 
- </property>
 <property name="text">
 <string>Phase:</string>
 </property>
@@ -87,10 +81,7 @@
 <item row="1" column="0">
 <widget class="QLabel" name="label_26">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Time Remaining:</string>
 </property>
 </widget>
 </item>
@@ -263,10 +254,7 @@
 <item row="2" column="0">
 <widget class="QLabel" name="label_6">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Audio Codec:</string>
 </property>
 </widget>
 </item>
@@ -287,21 +275,12 @@
 <item row="3" column="0">
 <widget class="QLabel" name="label_8">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Container:</string>
 </property>
 </widget>
 </item>
 <item row="1" column="0">
 <widget class="QLabel" name="label_4">
- <property name="font">
- 
- <weight>75</weight>
- <bold>true</bold>
- 
- </property>
 <property name="text">
 <string>Video Codec:</string>
 </property>
@@ -337,20 +316,14 @@
 <item row="1" column="0">
 <widget class="QLabel" name="label_20">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Audio Size:</string>
 </property>
 </widget>
 </item>
 <item row="2" column="0">
 <widget class="QLabel" name="label_22">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Total Size:</string>
 </property>
 </widget>
 </item>
@@ -371,10 +344,7 @@
 <item row="0" column="0">
 <widget class="QLabel" name="label_18">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Video Size:</string>
 </property>
 </widget>
 </item>
@@ -395,7 +365,7 @@
 <widget class="QGroupBox" name="groupBox_2">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
+ <horstretch>1</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
 </property>
@@ -418,10 +388,7 @@
 <item row="2" column="0">
 <widget class="QLabel" name="label_16">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Average Bitrate:</string>
 </property>
 </widget>
 </item>
@@ -438,20 +405,14 @@
 <item row="0" column="0">
 <widget class="QLabel" name="label_10">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Processed Frames:</string>
 </property>
 </widget>
 </item>
 <item row="1" column="0">
 <widget class="QLabel" name="label_14">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Quantiser:</string>
 </property>
 </widget>
 </item>
@@ -499,10 +460,7 @@
 <item row="0" column="0">
 <widget class="QLabel" name="label_24">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Elapsed:</string>
 </property>
 </widget>
 </item>
@@ -523,10 +481,7 @@
 <item row="1" column="0">
 <widget class="QLabel" name="label_28">
 <property name="text">
- <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Frames/sec:</string>
 </property>
 </widget>
 </item>

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp Changed

@@ -42,6 +42,7 @@
 #include "ADM_videoFilterApi.h"
 #include "ADM_videoFilters.h"
 #include "ADM_toolkitQt.h"
+#include "ADM_preview.h"
 
 #include "prefs.h"
 #include "ADM_edScriptGenerator.h"
@@ -275,7 +276,11 @@
     previewDialog = new Ui_seekablePreviewWindow(this, filter, 0);
     previewDialog->setModal(true);
     connect(previewDialog, SIGNAL(accepted()), this, SLOT(closePreview()));
+    connect(previewDialog, SIGNAL(rejected()), this, SLOT(closePreview()));
+    qtRegisterDialog(previewDialog);
     previewDialog->show();
+    previewDialog->seekablePreview->adjustCanvasPosition();
+    previewDialog->canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
 }
 /**
  * \fn closePreview
@@ -284,6 +289,7 @@
 {
     if (previewDialog)
     {
+        qtUnregisterDialog(previewDialog);
         delete previewDialog;
         previewDialog = NULL;
     }
@@ -680,6 +686,7 @@
     connect(activeList,SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(activeListContextMenu(const QPoint &)));
 
     this->installEventFilter(this);
+    originalTime = admPreview::getCurrentPts();
 }
 
 /**
@@ -690,7 +697,7 @@
     if(previewDialog) 
         delete previewDialog;
     previewDialog=NULL;
-
+    admPreview::seekToTime(originalTime);
 }
 
 /**

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -114,7 +114,7 @@
 static bool uiRunning=false;
 static bool uiIsMaximized=false;
 
-bool needsResizing=false;
+static bool needsResizing=false;
 
 #define WIDGET(x) (((MainWindow *)QuiMainWindows)->ui.x)
 
@@ -255,9 +255,11 @@
 * \fn sliderPressed
 */
 void MainWindow::sliderPressed(void)
-{ 
- dragTimer.stop();
- dragState=dragState_Active;
+{
+ if(playing)
+ sendAction(ACT_PlayAvi); // stop playback
+ dragTimer.stop();
+ dragState=dragState_Active;
 // ADM_info("Pressed\n");
 }
 /**
@@ -304,8 +306,15 @@
 AVDM_setVolume(0);
 }
 
-void MainWindow::previewModeChanged(int flop)
+void MainWindow::previewModeChangedFromMenu(bool flop)
+{
+ ui.toolBar->actions().at(5)->setChecked(flop);
+ sendAction(ACT_PreviewChanged);
+}
+
+void MainWindow::previewModeChangedFromToolbar(bool flop)
 {
+ ui.menuVideo->actions().at(3)->setChecked(flop);
 sendAction(ACT_PreviewChanged);
 }
 
@@ -341,6 +350,17 @@
 }
 
 /**
+ \fn setRefreshCap
+*/
+void MainWindow::setRefreshCap(void)
+{
+ refreshCapEnabled=false;
+ refreshCapValue=0;
+ prefs->get(FEATURES_CAP_REFRESH_ENABLED,&refreshCapEnabled);
+ prefs->get(FEATURES_CAP_REFRESH_VALUE,&refreshCapValue);
+}
+
+/**
 \fn ctor
 */
 MainWindow::MainWindow(const vector<IScriptEngine*>& scriptEngines) : _scriptEngines(scriptEngines), QMainWindow()
@@ -349,9 +369,6 @@
 qtRegisterDialog(this);
 ui.setupUi(this);
 dragState=dragState_Normal;
- refreshCapEnabled=false;
- prefs->get(FEATURES_CAP_REFRESH_ENABLED,&refreshCapEnabled);
- prefs->get(FEATURES_CAP_REFRESH_VALUE,&refreshCapValue);
 recentFiles = NULL;
 recentProjects = NULL;
 
@@ -363,8 +380,6 @@
 //
 connect( this,SIGNAL(actionSignal(Action )),this,SLOT(actionSlot(Action )));
 //
- connect( ui.checkDisplayOut,SIGNAL(stateChanged(int)),this,SLOT(previewModeChanged(int)));
- //
 connect(this, SIGNAL(updateAvailable(int,std::string,std::string)),this,SLOT(updateAvailableSlot(int,std::string,std::string)));
 
 /*
@@ -383,7 +398,7 @@
 ADM_mwNavSlider *qslider=(ADM_mwNavSlider *)slider;
 slider->setMinimum(0);
 slider->setMaximum(ADM_LARGE_SCALE);
-#if 1
+#if !(defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(5,10,0))
 slider->setTickInterval(ADM_SCALE_INCREMENT);
 slider->setTickPosition(QSlider::TicksBothSides);
 #endif
@@ -452,6 +467,8 @@
 buildCustomMenu(); // action lists are populated (i.e. buildActionLists() called) within buildCustomMenu()
 buildButtonLists();
 // 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)));
 
 this->installEventFilter(this);
 slider->installEventFilter(this);
@@ -461,7 +478,11 @@
 this->setFocus(Qt::OtherFocusReason);
 
 setAcceptDrops(true);
- setWindowIcon(QIcon(MKICON(avidemux_icon_small)));
+#ifndef __APPLE__
+ setWindowIcon(QIcon(MKICON(avidemux_icon_small)));
+#else
+ setWindowIcon(QIcon(MKOSXICON(avidemux)));
+#endif
 
 // Hook also the toolbar
 connect(ui.toolBar, SIGNAL(actionTriggered ( QAction *)),this,SLOT(searchToolBar(QAction *)));
@@ -507,6 +528,7 @@
 {"actionProperties", ACT_VIDEO_PROPERTIES},
 {"actionLoad_run_project", ACT_RUN_SCRIPT},
 {"actionSave_project", ACT_SAVE_PY_SCRIPT},
+{"actionPlayFiltered", ACT_PreviewChanged},
 
 {NULL,ACT_DUMMY}
 };
@@ -671,6 +693,8 @@
 connect( ui.menuView,SIGNAL(triggered(QAction*)),this,SLOT(searchViewMenu(QAction*)));
 buildMenu(ui.menuView, &myMenuView[0], myMenuView.size());
 
+ ui.menuVideo->actions().at(3)->setCheckable(true);
+
 return true;
 }
 
@@ -855,6 +879,9 @@
 ui.checkBox_TimeShift->setEnabled(false);
 ui.spinBox_TimeValue->setEnabled(false);
 
+ if(getPreviewMode()!=ADM_PREVIEW_NONE)
+ slider->setEnabled(false);
+
 return;
 }
 
@@ -906,6 +933,9 @@
 haveRecentItems=true;
 ui.menuRecent->actions().back()->setEnabled(haveRecentItems);
 
+ ui.selectionDuration->setEnabled(vid);
+ slider->setEnabled(vid);
+
 updateCodecWidgetControlsState();
 // actions performed by the code above may result in a window resize event,
 // which in turn may initiate unwanted zoom changes e.g. when stopping playback
@@ -935,10 +965,14 @@
 ui.pushButtonVideoFilter->setEnabled(b);
 // take care of the "Filter" item in the menu "Video" as well
 ui.menuVideo->actions().at(2)->setEnabled(b);
+ ui.menuVideo->actions().at(3)->setEnabled(b);
+ ui.toolBar->actions().at(5)->setEnabled(b);
 }else
 {
 ui.pushButtonVideoFilter->setEnabled(false);
 ui.menuVideo->actions().at(2)->setEnabled(false);
+ ui.menuVideo->actions().at(3)->setEnabled(false);
+ ui.toolBar->actions().at(5)->setEnabled(false);
 }
 
 b=false;
@@ -1261,9 +1295,9 @@
 }else
 {
 if(!swpud)
- sendAction(ACT_NextKFrame);
- else
 sendAction(ACT_PreviousKFrame);
+ else
+ sendAction(ACT_NextKFrame);
 }
 return true;
 case Qt::Key_C:
@@ -1349,11 +1383,14 @@
 threshold = 0;
 }
 
- blockResizing = true;
- admPreview::setMainDimension(w,h,zoom);
- actZoomCalled = false;
- admPreview::samePicture(); // required at least for VDPAU
- blockResizing = false;
+ if(zoom > oldzoom + .001 || zoom < oldzoom - .001)
+ {
+ blockResizing = true;
+ admPreview::setMainDimension(w,h,zoom);
+ actZoomCalled = false;
+ admPreview::samePicture(); // required at least for VDPAU
+ blockResizing = false;
+ }
 }
 if (watched == ui.sliderPlaceHolder)
 {
@@ -1416,6 +1453,9 @@
 UI_resize(w,h);
 UI_setNeedsResizingFlag(false);
 }
+ // Always adjust zoom on maximize
+ if (ev->oldState() != Qt::WindowMaximized && QuiMainWindows->isMaximized())
+ ignoreResizeEvent = false;
 }
 QWidget::changeEvent(event);
 }
@@ -1592,7 +1632,11 @@
 myApplication=new myQApplication (global_argc, global_argv);
 myApplication->connect(myApplication, SIGNAL(lastWindowClosed()), myApplication, SLOT(quit()));
 myApplication->connect(myApplication, SIGNAL(aboutToQuit()), myApplication, SLOT(cleanup()));
+#ifdef __APPLE__
+ Q_INIT_RESOURCE(avidemux_osx);
+#else
 Q_INIT_RESOURCE(avidemux);
+#endif
 Q_INIT_RESOURCE(filter);
 
 loadTranslator();
@@ -1640,9 +1684,9 @@
 #else
 ADM_info("OpenGL: Not enabled at built time.\n");
 #endif
- 
- 
- 
+
+ admPreview::setMainDimension(0,0,ZOOM_1_1);
+
 return 1;
 }
 /**
@@ -1686,14 +1730,15 @@
 {
 ((MainWindow *)QuiMainWindows)->updateActionShortcuts();
 ((MainWindow *)QuiMainWindows)->volumeWidgetOperational();
+ ((MainWindow *)QuiMainWindows)->setRefreshCap();
 }
 /**
- \fn UI_getCurrentPreview(void)
- \brief Read previewmode from comboxbox
+ \fn UI_getCurrentPreview
+ \brief Read previewmode from checkable menu actions
 */
 int UI_getCurrentPreview(void)
 {
- if(WIDGET(checkDisplayOut)->isChecked()) 
+ if(WIDGET(menuVideo)->actions().at(3)->isChecked() || WIDGET(toolBar)->actions().at(5)->isChecked())
 {
 printf("Output is ON\n");
 return 1;
@@ -1703,12 +1748,13 @@
 }
 
 /**
- \fn UI_setCurrentPreview(int ne)
- \brief Update comboxbox with previewmode
+ \fn UI_setCurrentPreview
+ \brief Update "Play filtered" checkable menu actions with previewmode
 */
 void UI_setCurrentPreview(int ne)
 {
- WIDGET(checkDisplayOut)->setChecked(!!ne);
+ WIDGET(menuVideo)->actions().at(3)->setChecked(!!ne);
+ WIDGET(toolBar)->actions().at(5)->setChecked(!!ne);
 }
 /**
 \fn FatalFunctionQt
@@ -2084,6 +2130,12 @@
 snprintf(text,79,"%02" PRIu32":%02" PRIu32":%02" PRIu32".%03" PRIu32,hh,mm,ss,ms);
 WIDGET(pushButtonJumpToMarkerB)->setText(text);
 
+ timems=(uint32_t)(b-a);
+ ms2time(timems,&hh,&mm,&ss,&ms);
+ snprintf(text,79,"%02" PRIu32":%02" PRIu32":%02" PRIu32".%03" PRIu32,hh,mm,ss,ms);
+ QString duration=QString("Selection: ")+QString(text);
+ WIDGET(selectionDuration)->setText(duration);
+
 slider->setMarkers(absoluteA, absoluteB);
 }
 
@@ -2187,6 +2239,19 @@
 UI_vuUpdate( volume);
 return true;
 }
+
+/**
+ \fn UI_setVolume
+*/
+bool UI_setVolume(void)
+{
+ if(WIDGET(toolButtonAudioToggle)->isChecked())
+ ((MainWindow *)QuiMainWindows)->volumeChange(0);
+ else
+ AVDM_setVolume(0);
+ return true;
+}
+
 /**
 \fn UI_setDecoderName
 */

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.cpp Changed

@@ -31,13 +31,27 @@
 
 static ADM_Qvumeter *vuWidget = NULL;
 
+// #warning Assume rgb bbuffer is 32bits aligned...
+#define GREEN 0xFF00FF00
+#define YELLOW 0xFFA0C000
+#define RED 0xFFFF0000
+#define BLACK 0xFF000000
+
 ADM_Qvumeter::ADM_Qvumeter(QWidget *z, int width, int height) : QWidget(z)
 {
 	this->resize(width, height);
 	z->resize(width + 2, height + 2);
 
 	rgbDataBuffer = new uint8_t[width * height * 4];
-	memset(rgbDataBuffer, 0, width * height * 4);
+ for(int i=0;i<64;i++)
+ {
+ uint8_t *ptr = rgbDataBuffer + (width * i * 4);
+ uint32_t *data = (uint32_t *)ptr;
+ for(int j=0;j<64;j++)
+ {
+ *data++=BLACK;
+ }
+ }
 }
 
 ADM_Qvumeter::~ADM_Qvumeter()
@@ -67,14 +81,8 @@
 \fn UI_vuUpdate
 \brief Update vumeter, input is volume per channel between 0 & 255
 */
-// #warning Assume rgb bbuffer is 32bits aligned...
-#define GREEN 0x0000FF00
-#define YELLOW 0x00A0C000
-#define RED 0x00FF0000
-
 bool UI_vuUpdate(uint32_t volume[6])
 {
-	 memset(vuWidget->rgbDataBuffer, 0, vuWidget->width() * vuWidget->height() * 4);
 // Draw lines
 for(int i=0;i<6;i++)
 {
@@ -92,7 +100,7 @@
 }
 for(int j=vol;j<64;j++)
 {
- *data++=0;
+ *data++=BLACK;
 }
 }
 #if 0

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux.qrc -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux.qrc Changed

avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux_osx.qrc Added

@@ -0,0 +1,39 @@
+<RCC>
+ <qresource prefix="/new/prefix1" >
+ <file>pics/add_sub_task.png</file>
+ <file>pics/arts.png</file>
+ <file>pics/avidemux.icns</file>
+ <file>pics/back.png</file>
+ <file>pics/calc.png</file>
+ <file>pics/fileopen.png</file>
+ <file>pics/filesave.png</file>
+ <file>pics/filesaveas.png</file>
+ <file>pics/forward.png</file>
+ <file>pics/gotoA.png</file>
+ <file>pics/gotoB.png</file>
+ <file>pics/info.png</file>
+ <file>pics/markA.png</file>
+ <file>pics/markB.png</file>
+ <file>pics/next.png</file>
+ <file>pics/next_black.png</file>
+ <file>pics/player_end.png</file>
+ <file>pics/player_fwd.png</file>
+ <file>pics/player_play.png</file>
+ <file>pics/forward1mn.png</file>
+ <file>pics/backward1mn.png</file>
+ <file>pics/player_rew.png</file>
+ <file>pics/player_start.png</file>
+ <file>pics/player_stop.png</file>
+ <file>pics/play_filtered.png</file>
+ <file>pics/prev_black.png</file>
+ <file>pics/preview_input.png</file>
+ <file>pics/preview_output.png</file>
+ <file>pics/preview_separate.png</file>
+ <file>pics/preview_side.png</file>
+ <file>pics/preview_top.png</file>
+ <file>pics/previous.png</file>
+ <file>pics/project_open.png</file>
+ <file>pics/thumbnail.png</file>
+ <file>pics/volume.png</file>
+ </qresource>
+</RCC>

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui Changed

@@ -109,7 +109,7 @@
 <x>0</x>
 <y>0</y>
 <width>858</width>
- <height>30</height>
+ <height>21</height>
 </rect>
 </property>
 <property name="contextMenuPolicy">
@@ -194,12 +194,12 @@
 <addaction name="menuHelp"/>
 </widget>
 <widget class="QToolBar" name="toolBar">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
 <property name="contextMenuPolicy">
 <enum>Qt::PreventContextMenu</enum>
 </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
 <attribute name="toolBarArea">
 <enum>TopToolBarArea</enum>
 </attribute>
@@ -210,6 +210,8 @@
 <addaction name="actionOpen"/>
 <addaction name="actionSave_video"/>
 <addaction name="actionProperties"/>
+ <addaction name="separator"/>
+ <addaction name="actionPlayFiltered"/>
 </widget>
 <widget class="QDockWidget" name="codecWidget">
 <property name="styleSheet">
@@ -538,22 +540,6 @@
 </spacer>
 </item>
 <item>
- <spacer name="verticalSpacer_9">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>13</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
 <layout class="QHBoxLayout" name="horizontalLayout_2">
 <item>
 <widget class="QLabel" name="label_5">
@@ -587,6 +573,22 @@
 </layout>
 </item>
 <item>
+ <spacer name="verticalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>13</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
 <layout class="QHBoxLayout" name="AudioLayout">
 <property name="spacing">
 <number>0</number>
@@ -1326,6 +1328,7 @@
 <property name="minimumSize">
 <size>
 <width>100</width>
+ <height>0</height>
 </size>
 </property>
 <property name="text">
@@ -1535,20 +1538,16 @@
 </property>
 </widget>
 </item>
- <item row="3" column="1">
- <widget class="QCheckBox" name="checkDisplayOut">
- <property name="toolTip">
- <string>Display output video on playback</string>
- </property>
- <property name="text">
- <string/>
+ <item row="3" column="0" colspan="3">
+ <widget class="QLabel" name="selectionDuration">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
 </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QLabel" name="label">
 <property name="text">
- <string>Play filtered</string>
+ <string>Selection: 000000</string>
 </property>
 </widget>
 </item>
@@ -1604,7 +1603,7 @@
 </property>
 <property name="icon">
 <iconset resource="avidemux.qrc">
- <normaloff>:/new/prefix1/pics/arts.png</normaloff>:/new/prefix1/pics/arts.png</iconset>
+ <normaloff>:/new/prefix1/pics/arts.png</normaloff>:/new/prefix1/pics/arts.png</iconset>
 </property>
 <property name="checkable">
 <bool>true</bool>
@@ -1736,6 +1735,18 @@
 <string>Save Video</string>
 </property>
 </action>
+ <action name="actionPlayFiltered">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="avidemux.qrc">
+ <normaloff>:/new/prefix1/pics/play_filtered.png</normaloff>:/new/prefix1/pics/play_filtered.png</iconset>
+ </property>
+ <property name="text">
+ <string>Play filtered</string>
+ </property>
+ </action>
 <action name="actionLoad_run_project">
 <property name="icon">
 <iconset resource="avidemux.qrc">

avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/pics/avidemux.icns Added

avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/pics/play_filtered.png Added

avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/translator.cpp Added

@@ -0,0 +1,156 @@
+#include <stdio.h>
+#include <QtCore/QMap>
+#include <QtCore/QLocale>
+#include <QtCore/QTranslator>
+#include <QApplication>
+#include <QtCore/QString>
+#include "ADM_default.h"
+#include "ADM_inttype.h"
+#include "ADM_files.h"
+#include "ADM_coreTranslator.h"
+#include "prefs.h"
+
+#define MAX_UNLOADED_MSG_LENGTH 400
+static QTranslator *qtTranslator;
+static QTranslator *avidemuxTranslator;
+static QMap<QString, char*> *map = NULL;
+static bool translatorLoaded = false;
+
+static int loadTranslation(QTranslator *qTranslator, QString translation)
+{
+ ADM_info("[Locale] Loading language file %s ", translation.toUtf8().constData());
+
+ if (qTranslator->load(translation))
+ {
+ QApplication::installTranslator(qTranslator);
+ ADM_info("succeeded\n");
+ return 1;
+ }
+ ADM_warning("FAILED\n");
+ return 0;
+}
+
+const char* qt4Translate(const char *__domainname, const char *__msgid)
+{
+ QString msgid = QString(__msgid);
+
+ if (!map)
+ map = new QMap<QString, char*>;
+
+ if (!map->contains(msgid))
+ {
+ QByteArray translatedMessage = QApplication::translate(__domainname, __msgid).toUtf8();
+ int copyLength = translatedMessage.length() + 1;
+ char* buffer = new char[translatorLoaded ? copyLength : MAX_UNLOADED_MSG_LENGTH + 1];
+
+ if (!translatorLoaded && copyLength > MAX_UNLOADED_MSG_LENGTH + 1)
+	{
+ copyLength = MAX_UNLOADED_MSG_LENGTH;
+ buffer[MAX_UNLOADED_MSG_LENGTH] = '\0';
+ }
+
+ memcpy(buffer, translatedMessage.constData(), copyLength);
+
+ (*map)[msgid] = buffer;
+ }
+//#warning DANGEROUS FIXME
+ return map->value(msgid); // dangerous
+}
+/**
+ * \fn initTranslator
+ */
+void initTranslator(void)
+{
+ ADM_InitTranslator(qt4Translate);
+}
+
+#define HIDE_STRING_FROM_QT(domainname, msgid) QApplication::translate(domainname, msgid) // to hide string from lupdate so a true test can be conducted
+
+void loadTranslator(void)
+{
+ std::string lang;
+ bool autoSelect=true;
+ if(prefs->get(DEFAULT_LANGUAGE,lang))
+ {
+ if(lang.size() && lang.compare("auto"))
+ autoSelect=false;
+ }
+ if(autoSelect)
+ {
+ ADM_info("Using system language\n");
+ lang=std::string(QLocale::system().name().toUtf8().constData());
+ }else
+ {
+ ADM_info("Language forced \n");
+ }
+ ADM_info("Initializing language %s\n",lang.c_str());
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+ const std::string flavor="qt4";
+#else
+ const std::string flavor="qt5";
+#endif
+ std::string i18nFolder=ADM_getI8NDir(flavor);
+ ADM_info("Translation folder is <%s>\n",i18nFolder.c_str());
+ QString appdir = QString(i18nFolder.c_str());
+ QString languageFile;
+ if(lang.size())
+ {
+ languageFile=QString(lang.c_str());
+ }
+ int nbLoaded=0;
+ qtTranslator=new QTranslator();
+ avidemuxTranslator=new QTranslator();
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+ nbLoaded+=loadTranslation(qtTranslator, appdir + "qt_" + languageFile);
+#else
+ nbLoaded+=loadTranslation(qtTranslator, appdir + "qtbase_" + languageFile);
+#endif
+ nbLoaded+=loadTranslation(avidemuxTranslator, appdir + "avidemux_" + languageFile);
+ translatorLoaded = true;
+ if(!nbLoaded) // Nothing to translate..
+ {
+ ADM_info("No translation loaded.\n");
+ return;
+ }
+ ADM_info("Updating translations...\n");
+ // Re-translate existing map (to take care of global strings already allocated)
+ if(!map)
+ map = new QMap<QString, char*>;
+ QMapIterator<QString, char*> mapIterator(*map);
+
+ while (mapIterator.hasNext())
+ {
+ mapIterator.next();
+
+ QByteArray translatedMessage = QApplication::translate("", mapIterator.key().toLatin1().constData()).toUtf8();
+ char *buffer = mapIterator.value();
+ int copyLength = translatedMessage.length() + 1;
+
+ if (copyLength > MAX_UNLOADED_MSG_LENGTH + 1)
+ {
+ copyLength = MAX_UNLOADED_MSG_LENGTH;
+ buffer[MAX_UNLOADED_MSG_LENGTH] = '\0';
+ }
+
+ memcpy(buffer, translatedMessage.constData(), copyLength);
+ }
+
+ ADM_info("[Locale] Test: &Edit -> %s\n\n", HIDE_STRING_FROM_QT("MainWindow", "&Edit").toUtf8().data());
+}
+
+void destroyTranslator(void)
+{
+ if (map)
+ {
+ QMapIterator<QString, char*> mapIterator(*map);
+
+ while (mapIterator.hasNext())
+ {
+ mapIterator.next();
+ delete [] mapIterator.value();
+ }
+
+ delete map;
+ }
+}
+

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp -> avidemux_2.7.1.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp Changed

@@ -1,9 +1,5 @@
 #include <stdio.h>
-#include <QtCore/QMap>
-#include <QtCore/QLocale>
-#include <QtCore/QTranslator>
 #include <QtCore/QUrl>
-#include <QApplication>
 #include <QDesktopServices>
 #include <QWidget>
 #include <QtCore/QString>
@@ -18,154 +14,9 @@
 #include "ADM_inttype.h"
 #include "ADM_files.h"
 #include "DIA_uiTypes.h"
-#include "ADM_coreTranslator.h"
-#include "prefs.h"
-extern QWidget *QuiMainWindows;
-
-#define MAX_UNLOADED_MSG_LENGTH 400
-static QTranslator *qtTranslator;
-static QTranslator *avidemuxTranslator;
-static QMap<QString, char*> *map = NULL;
-static bool translatorLoaded = false;
-
-static int loadTranslation(QTranslator *qTranslator, QString translation)
-{
-	ADM_info("[Locale] Loading language file %s ", translation.toUtf8().constData());
-
-	if (qTranslator->load(translation))
-	{
-		QApplication::installTranslator(qTranslator);
-		ADM_info("succeeded\n");
- return 1;
-	}
- ADM_warning("FAILED\n");
- return 0;
-}
-
-const char* qt4Translate(const char *__domainname, const char *__msgid)
-{
-	QString msgid = QString(__msgid);
-
-	if (!map)
-		map = new QMap<QString, char*>;
-
-	if (!map->contains(msgid))
-	{
-		QByteArray translatedMessage = QApplication::translate(__domainname, __msgid).toUtf8();
-		int copyLength = translatedMessage.length() + 1;
-		char* buffer = new char[translatorLoaded ? copyLength : MAX_UNLOADED_MSG_LENGTH + 1];
-
-		if (!translatorLoaded && copyLength > MAX_UNLOADED_MSG_LENGTH + 1)
-		{
-			copyLength = MAX_UNLOADED_MSG_LENGTH;
-			buffer[MAX_UNLOADED_MSG_LENGTH] = '\0';
-		}
-
-		memcpy(buffer, translatedMessage.constData(), copyLength);
-
-		(*map)[msgid] = buffer;
-	}
-//#warning DANGEROUS FIXME
-	return map->value(msgid); // dangerous
-}
-/**
- * \fn initTranslator
- */
-void initTranslator(void) 
-{
- ADM_InitTranslator(qt4Translate);
-}
-
-#define HIDE_STRING_FROM_QT(domainname, msgid) QApplication::translate(domainname, msgid) // to hide string from lupdate so a true test can be conducted
-
-void loadTranslator(void)
-{
-	
- std::string lang;
- bool autoSelect=true;
- if(prefs->get(DEFAULT_LANGUAGE,lang))
- {
- if(lang.size() && lang.compare("auto"))
- autoSelect=false;
- }
- if(autoSelect)
- {
- ADM_info("Using system language\n");
- lang=std::string(QLocale::system().name().toUtf8().constData());
- }else
- {
- ADM_info("Language forced \n");
- }
- ADM_info("Initializing language %s\n",lang.c_str());
- #if QT_VERSION < QT_VERSION_CHECK(5,0,0) 
- const std::string flavor="qt4";
-#else 
- const std::string flavor="qt5";
-#endif
- std::string i18nFolder=ADM_getI8NDir(flavor); 
- ADM_info("Translation folder is <%s>\n",i18nFolder.c_str());
- QString appdir = QString(i18nFolder.c_str()); 
- QString languageFile;
- if(lang.size())
- {
- languageFile=QString(lang.c_str());
- }
- int nbLoaded=0;
- qtTranslator=new QTranslator();
- avidemuxTranslator=new QTranslator();
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
- nbLoaded+=loadTranslation(qtTranslator, appdir + "qt_" + languageFile);
-#else
- nbLoaded+=loadTranslation(qtTranslator, appdir + "qtbase_" + languageFile);
-#endif
- nbLoaded+=loadTranslation(avidemuxTranslator, appdir + "avidemux_" + languageFile);
- translatorLoaded = true;
- if(!nbLoaded) // Nothing to translate..
- {
- ADM_info("No translation loaded.\n");
- return;
- }
- ADM_info("Updating translations...\n");
- // Re-translate existing map (to take care of global strings already allocated)
- if(!map)
- map = new QMap<QString, char*>;
- QMapIterator<QString, char*> mapIterator(*map);
-
- while (mapIterator.hasNext())
- {
- mapIterator.next();
-
- QByteArray translatedMessage = QApplication::translate("", mapIterator.key().toLatin1().constData()).toUtf8();
- char *buffer = mapIterator.value();
- int copyLength = translatedMessage.length() + 1;
+#include "translator.cpp"
 
- if (copyLength > MAX_UNLOADED_MSG_LENGTH + 1)
- {
- copyLength = MAX_UNLOADED_MSG_LENGTH;
- buffer[MAX_UNLOADED_MSG_LENGTH] = '\0';
- }
-
- memcpy(buffer, translatedMessage.constData(), copyLength);
- }
-
- ADM_info("[Locale] Test: &Edit -> %s\n\n", HIDE_STRING_FROM_QT("MainWindow", "&Edit").toUtf8().data()); 
-}
-
-void destroyTranslator(void)
-{
-	if (map)
-	{
-		QMapIterator<QString, char*> mapIterator(*map);
-
-		while (mapIterator.hasNext())
-		{
-			mapIterator.next();
-			delete [] mapIterator.value();
-		}
-
-		delete map;
-	}
-}
+extern QWidget *QuiMainWindows;
 
 void getUIDescription(char* desc)
 {

avidemux_2.7.0.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux/qt4/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/Info.plist.in -> avidemux_2.7.1.tar.gz/avidemux/qt4/Info.plist.in Changed

avidemux_2.7.1.tar.gz/avidemux/qt4/admWin32.rc.in Added

avidemux_2.7.0.tar.gz/avidemux/qt4/adm_osx.cmake -> avidemux_2.7.1.tar.gz/avidemux/qt4/adm_osx.cmake Changed

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux.pro -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux.pro Changed

@@ -1,1870 +1,1908 @@
 HEADERS = \
-../../../avidemux_core/ADM_core/include/ADM_assert.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxer.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerUtils.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxerFfmpeg.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxer6_export.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/.ADM_muxer.h.swp \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerProto.h \ 
+../../../avidemux_core/ADM_coreJobs/include/sqlJobs.h \ 
+../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs_export.h \ 
+../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodec.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/adm_ogg.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodeclist.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_mpegstartcode.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_indexer.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxer.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_coreDemuxerMpeg6_export.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerPS.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerEs.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerMSDVR.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerTS.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_identify.h \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/static_assert.h \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.h \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/fast_mutex.h \ 
+../../../avidemux_core/ADM_core/include/ADM_default.h \ 
+../../../avidemux_core/ADM_core/include/ADM_inttype.h \ 
+../../../avidemux_core/ADM_core/include/ADM_crashdump.h \ 
+../../../avidemux_core/ADM_core/include/ADM_files.h \ 
+../../../avidemux_core/ADM_core/include/ADM_mangle_gcc.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_byteBuffer.h \ 
-../../../avidemux_core/ADM_core/include/ADM_clock.h \ 
+../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
+../../../avidemux_core/ADM_core/include/ADM_ptrQueue.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 \ 
 ../../../avidemux_core/ADM_core/include/ADM_core6_export.h \ 
-../../../avidemux_core/ADM_core/include/ADM_coreTranslator.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_cpp.h \ 
-../../../avidemux_core/ADM_core/include/ADM_cpuCap.h \ 
-../../../avidemux_core/ADM_core/include/ADM_crashdump.h \ 
-../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
+../../../avidemux_core/ADM_core/include/ADM_threads.h \ 
+../../../avidemux_core/ADM_core/include/ADM_coreTranslator.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_mingw.h \ 
+../../../avidemux_core/ADM_core/include/ADM_mangle.h \ 
+../../../avidemux_core/ADM_core/include/ADM_clock.h \ 
+../../../avidemux_core/ADM_core/include/ADM_assert.h \ 
+../../../avidemux_core/ADM_core/include/BVector.h \ 
+../../../avidemux_core/ADM_core/include/ADM_win32.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_other.h \ 
-../../../avidemux_core/ADM_core/include/ADM_crashdump_unix.h \ 
-../../../avidemux_core/ADM_core/include/ADM_default.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_dynamicLoading.h \ 
-../../../avidemux_core/ADM_core/include/ADM_files.h \ 
-../../../avidemux_core/ADM_core/include/ADM_inttype.h \ 
-../../../avidemux_core/ADM_core/include/ADM_mangle.h \ 
-../../../avidemux_core/ADM_core/include/ADM_mangle_gcc.h \ 
+../../../avidemux_core/ADM_core/include/ADM_vidMisc.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_mangle_vs.h \ 
+../../../avidemux_core/ADM_core/include/ADM_cpuCap.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_memsupport.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_misc.h \ 
-../../../avidemux_core/ADM_core/include/ADM_prettyPrint.h \ 
-../../../avidemux_core/ADM_core/include/ADM_ptrQueue.h \ 
-../../../avidemux_core/ADM_core/include/ADM_queue.h \ 
-../../../avidemux_core/ADM_core/include/ADM_threads.h \ 
-../../../avidemux_core/ADM_core/include/ADM_vidMisc.h \ 
-../../../avidemux_core/ADM_core/include/ADM_win32.h \ 
-../../../avidemux_core/ADM_core/include/BVector.h \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.h \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/fast_mutex.h \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/static_assert.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioClock.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audiodef.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioIdentify.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStream.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamAC3.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamBuffered.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamConstantChunk.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamDCA.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamEac3.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamMP3.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamPCM.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioWrite.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteAAC.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteWav.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioXiphUtils.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_baseAudioStream.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio6_export.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodec.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodeclist.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/adm_ogg.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audioDeviceInternal.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/ADM_coreAudioDevice6_export.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/audio_out.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_encodingContext.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_buffer.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_h264Encoding.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_bitstream.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder6_export.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecContext.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_encoderConf.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderInternal.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg_param.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_vdpau.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_golomb.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_avutil.h.patch \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter6_export.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterFunc.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterBridge.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/Query.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/libsqlitewrapped.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/StderrLog.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/IError.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/SysLog2.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/ADM_coreSqlLight3_export.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/Database.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/include/ADM_coreVideoToolbox.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/fglrxinfo.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvbaInternal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvba.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA_internal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecEmpty.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecNull.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_rgb16.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoDecoderInternal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_uyvy.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFsimple.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFVP9.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_rgb.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_colorspace.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_pp.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_interlaced.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_vidFieldUtil.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_imageFlags.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_vidField.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_coreImage6_export.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_internal.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_videoFilterDynamic.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_iface.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_imageResizer.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_image.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_print_priv.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_uiTypes.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_audioTracks.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_enter.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_factory.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_working.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_encoding.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h \ 
+../../../avidemux_core/ADM_coreUI/include/ADM_coreUI6_export.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_factoryStubs.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_fileSel.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_processing.h \ 
+../../../avidemux_core/ADM_coreUI/include/ADM_windowInfo.h \ 
 ../../../avidemux_core/ADM_coreAudioEncoder/include/ADM_coreAudioEncoder6_export.h \ 
 ../../../avidemux_core/ADM_coreAudioEncoder/include/audioencoder.h \ 
 ../../../avidemux_core/ADM_coreAudioEncoder/include/audioencoderInternal.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioFilter.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioResample.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/ADM_coreAudioFilterAPI6_export.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audio_encoderPlugin.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audioEncoderApi.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_bridge.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_conf.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_dolby.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_film2pal.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_internal.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter_param.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_mixer.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize_param.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_SRC.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_a52info.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacinfo.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacLatm.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_mp3info.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_audioParser6_export.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacinfo.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_a52info.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_dcainfo.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_eac3info.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_mp3info.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_bitmap.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer6_export.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpeg.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_demuxerInternal.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_Video.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/avifmt2.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/unix/avifmt.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_coreDemuxerMpeg6_export.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxer.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerEs.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerMSDVR.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerPS.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerTS.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_identify.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_indexer.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_mpegstartcode.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_colorspace.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_coreImage6_export.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_image.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_imageFlags.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_imageResizer.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_interlaced.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_pp.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_print_priv.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_rgb.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_iface.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_internal.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_videoFilterDynamic.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_vidField.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_vidFieldUtil.h \ 
-../../../avidemux_core/ADM_coreImageLoader/include/ADM_coreImageLoader6_export.h \ 
-../../../avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h \ 
-../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs.h \ 
-../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs_export.h \ 
-../../../avidemux_core/ADM_coreJobs/include/sqlJobs.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/.ADM_muxer.h.swp \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxer6_export.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxerFfmpeg.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxer.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerProto.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerUtils.h \ 
-../../../avidemux_core/ADM_coreScript/include/ADM_coreScript_export.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDF.h \ 
+../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFTimeStamp.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFInteger.h \ 
+../../../avidemux_core/ADM_coreScript/include/IScriptWriter.h \ 
+../../../avidemux_core/ADM_coreScript/include/ADM_ScriptEngineLoader.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFMenu.h \ 
-../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFTimeStamp.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFToggle.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDialogFactory.h \ 
-../../../avidemux_core/ADM_coreScript/include/ADM_ScriptEngineLoader.h \ 
-../../../avidemux_core/ADM_coreScript/include/IScriptEngine.h \ 
-../../../avidemux_core/ADM_coreScript/include/IScriptWriter.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ScriptShell.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreAvsProtocol.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreCommandSocket.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket6_export.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/ADM_coreSqlLight3_export.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/Database.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/IError.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/libsqlitewrapped.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/Query.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/StderrLog.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/SysLog2.h \ 
-../../../avidemux_core/ADM_coreSubtitles/include/ADM_coreSubtitles.h \ 
-../../../avidemux_core/ADM_coreUI/include/ADM_coreUI6_export.h \ 
-../../../avidemux_core/ADM_coreUI/include/ADM_windowInfo.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_audioTracks.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_encoding.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_enter.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_factory.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_factoryStubs.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_fileSel.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_processing.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_uiTypes.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_working.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_bitstream.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_codecType.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_compressedImage.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_confCouple.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_coreCodecMapping.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_coreJson.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_coreUtils.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_coreUtils6_export.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_fileio.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_frameType.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_getbits.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_h264_tag.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_iso639.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_last.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_memio.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_paramList.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_quota.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_string.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_threadQueue.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_writeRiff.h \ 
-../../../avidemux_core/ADM_coreUtils/include/FFcodecContext_param.h \ 
-../../../avidemux_core/ADM_coreUtils/include/fourcc.h \ 
-../../../avidemux_core/ADM_coreUtils/include/prefs.h \ 
-../../../avidemux_core/ADM_coreUtils/include/prefs2_list.h \ 
-../../../avidemux_core/ADM_coreUtils/src/JSONOptions.h \ 
-../../../avidemux_core/ADM_coreUtils/src/libjson.h \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs2.h \ 
+../../../avidemux_core/ADM_coreScript/include/IScriptEngine.h \ 
+../../../avidemux_core/ADM_coreScript/include/ADM_coreScript_export.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteWav.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamConstantChunk.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioIdentify.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamMP3.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStream.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioClock.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioWrite.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioXiphUtils.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamBuffered.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audiodef.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteAAC.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamAC3.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_baseAudioStream.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamDCA.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio6_export.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamPCM.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamEac3.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audioDeviceInternal.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/audio_out.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/ADM_coreAudioDevice6_export.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpeg.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/avifmt2.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/unix/avifmt.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_Video.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer6_export.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_demuxerInternal.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_bitmap.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/prefs2_pref.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.h \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs2.h \ 
+../../../avidemux_core/ADM_coreUtils/src/libjson.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONStats.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemoryPool.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/NumberToString.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONSharedString.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONStream.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONWorker.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONSingleton.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONValidator.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/GNU_C.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Strings_Defs.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/GNU_C.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Unknown_C.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Visual_C.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONGlobals.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemoryPool.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONSharedString.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONSingleton.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONStats.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONStream.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONValidator.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONWorker.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/NumberToString.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA_internal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvba.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvbaInternal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/fglrxinfo.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecEmpty.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFsimple.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFVP9.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecNull.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoDecoderInternal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_rgb16.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_uyvy.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder6_export.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg_param.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderInternal.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_encoderConf.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecContext.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter6_export.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterFunc.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterBridge.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_golomb.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_vdpau.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_avutil.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.h.patch \ 
-../../../avidemux/qt4/ADM_jobs/include/T_jobs.h \ 
-../../../avidemux/qt4/ADM_jobs/include/T_progress.h \ 
+../../../avidemux_core/ADM_coreUtils/src/JSONOptions.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_threadQueue.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_string.h \ 
+../../../avidemux_core/ADM_coreUtils/include/prefs2_list.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_coreUtils6_export.h \ 
+../../../avidemux_core/ADM_coreUtils/include/fourcc.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_memio.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_quota.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_last.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_coreJson.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_bitstream.h \ 
+../../../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/FFcodecContext_param.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_confCouple.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_paramList.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_h264_tag.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_coreUtils.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_fileio.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_frameType.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_iso639.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_compressedImage.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_writeRiff.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_getbits.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h \ 
+../../../avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h \ 
+../../../avidemux_core/ADM_coreImageLoader/include/ADM_coreImageLoader6_export.h \ 
+../../../avidemux_core/ADM_coreSubtitles/include/ADM_coreSubtitles.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreCommandSocket.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreAvsProtocol.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket6_export.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_bridge.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioResample.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_dolby.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_film2pal.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_SRC.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/ADM_coreAudioFilterAPI6_export.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_conf.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_mixer.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioFilter.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize_param.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter_param.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_internal.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audio_encoderPlugin.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audioEncoderApi.h \ 
 ../../../avidemux/qt4/ADM_openGL/include/ADM_openGl.h \ 
 ../../../avidemux/qt4/ADM_openGL/include/ADM_openGL_export.h \ 
-../../../avidemux/qt4/ADM_UIs/include/ADM_dialogFactoryQt4.h \ 
-../../../avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h \ 
-../../../avidemux/qt4/ADM_UIs/include/ADM_UIQT46_export.h \ 
-../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h \ 
-../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4_template.h \ 
-../../../avidemux/qt4/ADM_UIs/include/T_openGLFilter.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_bitrate.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_button.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_filesel.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_menu.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_notch.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_slider.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_threadCount.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_toggle.h \ 
-../../../avidemux/qt4/ADM_update/include/ADM_update.h \ 
 ../../../avidemux/qt4/ADM_update/private_inc/ADM_updateImpl.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_flyPreview.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTrackClass.h \ 
+../../../avidemux/qt4/ADM_update/include/ADM_update.h \ 
+../../../avidemux/qt4/ADM_jobs/include/T_progress.h \ 
+../../../avidemux/qt4/ADM_jobs/include/T_jobs.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_calculator.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_vobsub.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTrackClass.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_flyPreview.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_calculator.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/T_index_pg.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qtray.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/FileAction.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_timeStamp.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_filesel.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_slider.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_menu.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_threadCount.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_notch.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_toggle.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_button.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_bitrate.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.h \ 
+../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4_template.h \ 
+../../../avidemux/qt4/ADM_UIs/include/ADM_UIQT46_export.h \ 
+../../../avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h \ 
+../../../avidemux/qt4/ADM_UIs/include/ADM_dialogFactoryQt4.h \ 
+../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h \ 
+../../../avidemux/qt4/ADM_UIs/include/T_openGLFilter.h \ 
+../../../avidemux/common/ADM_toolkit/ADM_packetQueue.h \ 
+../../../avidemux/common/ADM_toolkit/ADM_audioQueue.h \ 
 ../../../avidemux/common/A_functions.h \ 
-../../../avidemux/common/ADM_audioFilter/include/ADM_audioFilterInterface.h \ 
-../../../avidemux/common/ADM_audioFilter/include/audiofilter_access.h \ 
-../../../avidemux/common/ADM_audioFilter/include/audiofilter_thread.h \ 
+../../../avidemux/common/ADM_videoEncoder/include/ADM_videoEncoderApi.h \ 
+../../../avidemux/common/gui_action.hxx \ 
+../../../avidemux/common/prototype.h \ 
+../../../avidemux/common/ADM_render/GUI_xvRender.h \ 
+../../../avidemux/common/ADM_render/GUI_simpleRender.h \ 
+../../../avidemux/common/ADM_render/ADM_render6_export.h \ 
+../../../avidemux/common/ADM_render/GUI_nullRender.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3DApi.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h \ 
+../../../avidemux/common/ADM_render/GUI_libvaRender.h \ 
+../../../avidemux/common/ADM_render/GUI_render.h \ 
+../../../avidemux/common/ADM_render/GUI_sdlRender.h \ 
+../../../avidemux/common/ADM_render/GUI_renderInternal.h \ 
+../../../avidemux/common/ADM_render/GUI_qtGlRender.h \ 
+../../../avidemux/common/ADM_render/GUI_accelRender.h \ 
+../../../avidemux/common/ADM_render/GUI_vdpauRender.h \ 
+../../../avidemux/common/ADM_script2/include/ADM_script.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/common.h \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/fastest_coeffs.h \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.h \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/mid_qual_coeffs.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/float_cast.h \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/fastest_coeffs.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/high_qual_coeffs.h \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/mid_qual_coeffs.h \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_dolby_table.h \ 
-../../../avidemux/common/ADM_commonUI/ADM_tray.h \ 
-../../../avidemux/common/ADM_commonUI/DIA_busy.h \ 
-../../../avidemux/common/ADM_commonUI/DIA_defaultAskAvisynthPort.hxx \ 
-../../../avidemux/common/ADM_commonUI/DIA_idx_pg.h \ 
-../../../avidemux/common/ADM_commonUI/GUI_ui.h \ 
-../../../avidemux/common/ADM_commonUI/myOwnMenu.h \ 
-../../../avidemux/common/ADM_commonUI/systray.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edActiveAudioTracks.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edAudioTrack.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackExternal.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackFromVideo.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edCache.h \ 
+../../../avidemux/common/ADM_audioFilter/include/audiofilter_access.h \ 
+../../../avidemux/common/ADM_audioFilter/include/ADM_audioFilterInterface.h \ 
+../../../avidemux/common/ADM_audioFilter/include/audiofilter_thread.h \ 
+../../../avidemux/common/ADM_videoCodec/private_inc/ADM_ffmpeg_vdpau_internal.h \ 
+../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecLibVA.h \ 
+../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h \ 
+../../../avidemux/common/ADM_videoCodec/private_inc/ADM_ffmpeg_videotoolbox_internal.h \ 
+../../../avidemux/common/ADM_videoCodec/include/ADM_codecXvba.h \ 
+../../../avidemux/common/ADM_videoCodec/include/ADM_ffmpeg_xvba_internal.h \ 
+../../../avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h \ 
+../../../avidemux/common/ADM_muxerGate/include/ADM_videoProcess.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_edEditableAudioTrack.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_edit.hxx \ 
+../../../avidemux/common/ADM_editor/include/IEditor.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_editInternal.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edPoolOfAudioTracks.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edPtsDts.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edAudioTrack.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_edScriptGenerator.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_segment.h \ 
-../../../avidemux/common/ADM_editor/include/IEditor.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edCache.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edActiveAudioTracks.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackFromVideo.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackExternal.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edPoolOfAudioTracks.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edPtsDts.h \ 
 ../../../avidemux/common/ADM_libraries/ADM_libsdl/SDLMain.h \ 
-../../../avidemux/common/adm_main.h \ 
-../../../avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h \ 
-../../../avidemux/common/ADM_muxerGate/include/ADM_videoProcess.h \ 
+../../../avidemux/common/ADM_commonUI/myOwnMenu.h \ 
+../../../avidemux/common/ADM_commonUI/DIA_busy.h \ 
+../../../avidemux/common/ADM_commonUI/DIA_defaultAskAvisynthPort.hxx \ 
+../../../avidemux/common/ADM_commonUI/GUI_ui.h \ 
+../../../avidemux/common/ADM_commonUI/DIA_idx_pg.h \ 
+../../../avidemux/common/ADM_commonUI/systray.h \ 
+../../../avidemux/common/ADM_commonUI/ADM_tray.h \ 
 ../../../avidemux/common/ADM_plugin/ADM_vidEnc_plugin.h \ 
-../../../avidemux/common/ADM_preview.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3DApi.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
-../../../avidemux/common/ADM_render/ADM_render6_export.h \ 
-../../../avidemux/common/ADM_render/GUI_accelRender.h \ 
-../../../avidemux/common/ADM_render/GUI_libvaRender.h \ 
-../../../avidemux/common/ADM_render/GUI_nullRender.h \ 
-../../../avidemux/common/ADM_render/GUI_qtGlRender.h \ 
-../../../avidemux/common/ADM_render/GUI_render.h \ 
-../../../avidemux/common/ADM_render/GUI_renderInternal.h \ 
-../../../avidemux/common/ADM_render/GUI_sdlRender.h \ 
-../../../avidemux/common/ADM_render/GUI_simpleRender.h \ 
-../../../avidemux/common/ADM_render/GUI_vdpauRender.h \ 
-../../../avidemux/common/ADM_render/GUI_xvRender.h \ 
-../../../avidemux/common/ADM_script2/include/ADM_script.h \ 
 ../../../avidemux/common/ADM_slave.h \ 
-../../../avidemux/common/ADM_toolkit/ADM_audioQueue.h \ 
-../../../avidemux/common/ADM_toolkit/ADM_packetQueue.h \ 
-../../../avidemux/common/ADM_videoCodec/include/ADM_codecXvba.h \ 
-../../../avidemux/common/ADM_videoCodec/include/ADM_ffmpeg_xvba_internal.h \ 
-../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h \ 
-../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecLibVA.h \ 
-../../../avidemux/common/ADM_videoCodec/private_inc/ADM_ffmpeg_vdpau_internal.h \ 
-../../../avidemux/common/ADM_videoEncoder/include/ADM_videoEncoderApi.h \ 
+../../../avidemux/common/ADM_videoFilter2/src/partial.h \ 
 ../../../avidemux/common/ADM_videoFilter2/include/ADM_filterChain.h \ 
 ../../../avidemux/common/ADM_videoFilter2/include/ADM_filterThread.h \ 
-../../../avidemux/common/ADM_videoFilter2/include/ADM_videoFilterApi.h \ 
 ../../../avidemux/common/ADM_videoFilter2/include/ADM_videoFilters.h \ 
-../../../avidemux/common/ADM_videoFilter2/src/partial.h \ 
+../../../avidemux/common/ADM_videoFilter2/include/ADM_videoFilterApi.h \ 
 ../../../avidemux/common/avi_vars.h \ 
-../../../avidemux/common/gui_action.hxx \ 
-../../../avidemux/common/prototype.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52_internal.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/attributes.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/mm_accel.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/tables.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/config.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/global.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/mad.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/madmem.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.h \ 
-../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.h \ 
-../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame_param.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.h \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.h \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfIo.h \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_internal.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/avsHeader.h \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h \ 
+../../../avidemux/common/ADM_preview.h \ 
+../../../avidemux/common/adm_main.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.h \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tagenum.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.h \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.h \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tagenum.h \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.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 \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h \ 
+../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.h \ 
+../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.h \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Tree.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.h \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.h \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsGetBits.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h \ 
-../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.h \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.h \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.h \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.h \ 
-../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.h \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.h \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.h \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndex.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/GUI_mux.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.hxx \ 
-../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/chapter.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file_prop.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/general.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/isma.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_generic.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_tags.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/mp4v2.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/platform.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h.in \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/sample.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/streaming.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track_prop.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h.in \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/endian.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_base.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_posix.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32_impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/warning.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.h \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.h \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfIo.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/avsHeader.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_internal.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/logo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/crop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asciiView/ascii_font.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv_param.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_debug.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidConvolution.hxx \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift_param.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_func_template.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/config.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache_template.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/x86/cpuid.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_types.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
+../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder_debug.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/vaDefines.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpegMatrix.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atoms.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/bmff.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/enum.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/CoverArtBox.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/src.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/type.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/itmf.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/generic.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/itmf.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/Tags.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/type.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/CoverArtBox.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/enum.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/log.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4array.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4container.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4property.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4track.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4array.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/util.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/qtff.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/coding.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/PictureAspectRatioBox.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/ColorParameterBox.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/PictureAspectRatioBox.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/qtff.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/src.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4container.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/bmff.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/impl.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/text.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/util.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4track.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4property.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/warning.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/endian.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h.in \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_base.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_posix.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32_impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file_prop.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/general.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/isma.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/mp4v2.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/sample.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_generic.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h.in \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_tags.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/chapter.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track_prop.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/streaming.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/platform.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_inout.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/GUI_mux.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndex.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.hxx \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mthread.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_transfert.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/audiostrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/aunit.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/aunitbuffer.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg_intern.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/streamType.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/bits.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/decodebufmodel.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/format_codes.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mplexconsts.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/inputstrm.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/aunitbuffer.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_types.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/interact.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/aunit.hpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_logging.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_types.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mplexconsts.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/format_codes.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/multiplexor.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_transfert.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/decodebufmodel.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.hpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/outputstrm.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/audiostrm.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_inout.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/padstrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/streamType.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg_intern.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyClassDescriptor.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyFunc.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/PythonEngine.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/tinypy.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.h \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/modules/re/regexpr.h \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.h \ 
-../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpegMatrix.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asciiView/ascii_font.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache_template.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_func_template.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_types.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/config.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/x86/cpuid.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift_param.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv_param.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/crop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidConvolution.hxx \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/logo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_debug.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/tinypy.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/PythonEngine.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyFunc.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyClassDescriptor.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGlvertex.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-geometry.hh \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arc-bezier.hh \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs-bezier.hh \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-common-glsl.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-common.hh \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-freetype.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-geometry.hh \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-sdf-glsl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-common-glsl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-freetype.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs-bezier.hh \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGlDistort.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGlDistort.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGlvertex.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.h \ 
+../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.h \ 
+../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/config.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/mad.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/global.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/madmem.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/attributes.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52_internal.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/tables.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/mm_accel.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/opus/opus_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame_param.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.h \ 
 
 
 SOURCES = \
-../../../avidemux_core/ADM_core/src/ADM_benchmark.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_coreTranslator.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_cpuCap.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_apple.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_other.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp \ 
+../../../avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp \ 
+../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp \ 
+../../../avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp \ 
+../../../avidemux_core/ADM_coreJobs/src/sqlJobs.cpp \ 
+../../../avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPacket.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/addr2line.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_crashdump_vs.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_debug.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_threads.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_fileio.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_linux.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_mac.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_mingw.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_unix.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_vs.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_win32_mingw.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_win32.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_memcpy.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_memsupport.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_win32.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_unix.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_mingw.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_vs.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_misc.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/addr2line.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_debug.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_coreTranslator.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_other.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_queue.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_threads.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_win32.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_win32_mingw.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_benchmark.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_win32_vs.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_linux.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_apple.cpp \ 
 ../../../avidemux_core/ADM_core/src/TLK_clock.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFile.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioClock.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamAC3.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamConstantChunk.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamDCA.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamEac3.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamPCM.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioUtils.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioWrite.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteWav.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp \ 
-../../../avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp \ 
-../../../avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_cpuCap.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_queue.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecSettings.conf \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext.conf \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext_desc.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_buffer.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_bitstream.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_encodingContext.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_h263dec.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg2.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_movenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilter.cpp \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/SysLog.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/Database.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/StderrLog.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/Query.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/src/ADM_coreVideoToolbox.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/fglrx.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/ADM_coreXvba.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_test.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecs.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_print.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldUtil.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFields.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_videoFilter.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldASM.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldBlend.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_interlaceUtil.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_image.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_pp.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_factory.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_working.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_encoding.cpp \ 
 ../../../avidemux_core/ADM_coreAudioEncoder/src/audioencoder.cpp \ 
-../../../avidemux_core/ADM_coreAudioFilter/src/audiofilterAPI.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp \ 
 ../../../avidemux_core/ADM_coreAudioParser/src/ADM_a52info.cpp \ 
 ../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp \ 
 ../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacLatm.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp \ 
 ../../../avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp \ 
 ../../../avidemux_core/ADM_coreAudioParser/src/ADM_mp3info.cpp \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h \ 
-../../../avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp \ 
-../../../avidemux_core/ADM_coreDemuxer/src/ADM_dynaDemuxer.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPacket.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_image.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_pp.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_print.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_interlaceUtil.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_videoFilter.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldASM.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldBlend.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFields.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldUtil.cpp \ 
-../../../avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp \ 
-../../../avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp \ 
-../../../avidemux_core/ADM_coreJobs/src/sqlJobs.cpp \ 
-../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp \ 
-../../../avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp \ 
-../../../avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFInteger.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFMenu.cpp \ 
 ../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFTimeStamp.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFToggle.cpp \ 
 ../../../avidemux_core/ADM_coreScript/src/ADM_scriptDialogFactory.cpp \ 
 ../../../avidemux_core/ADM_coreScript/src/ADM_ScriptEngineLoader.cpp \ 
-../../../avidemux_core/ADM_coreSocket/src/ADM_avsProtocol.cpp \ 
-../../../avidemux_core/ADM_coreSocket/src/ADM_coreCommandSocket.cpp \ 
-../../../avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/Database.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/Query.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/StderrLog.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/SysLog.cpp \ 
-../../../avidemux_core/ADM_coreSubtitles/src/ADM_coreSubtitles.cpp \ 
-../../../avidemux_core/ADM_coreSubtitles/src/ADM_subConvert.cpp \ 
-../../../avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_encoding.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_factory.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_working.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_bitstream.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_confCouple.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFMenu.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFInteger.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFToggle.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteWav.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioClock.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFile.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamEac3.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamConstantChunk.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamDCA.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioUtils.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioWrite.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamPCM.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamAC3.cpp \ 
+../../../avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp \ 
+../../../avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp \ 
+../../../avidemux_core/ADM_coreDemuxer/src/ADM_dynaDemuxer.cpp \ 
+../../../avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_writeRiff.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_threadQueue.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_file.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_frameType.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorVC1.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/fourcc.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_memio.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_json.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_last.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_memio.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_string.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_threadQueue.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_writeRiff.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_confCouple.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_frameType.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs2_json.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/fourcc.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/prefs.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_bitstream.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_string.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/prefs2.conf \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs2_json.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorVC1.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONIterators.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode_Mutex.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONStream.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONValidator.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONWorker.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONWriter.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONIterators.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/libjson.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_test.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/ADM_coreXvba.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/fglrx.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecs.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext.conf \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext_desc.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecSettings.conf \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilter.cpp \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_h263dec.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_movenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg2.c.patch \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_jobProgress.cpp \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp \ 
+../../../avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp \ 
+../../../avidemux_core/ADM_coreSubtitles/src/ADM_subConvert.cpp \ 
+../../../avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp \ 
+../../../avidemux_core/ADM_coreSubtitles/src/ADM_coreSubtitles.cpp \ 
+../../../avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp \ 
+../../../avidemux_core/ADM_coreSocket/src/ADM_avsProtocol.cpp \ 
+../../../avidemux_core/ADM_coreSocket/src/ADM_coreCommandSocket.cpp \ 
+../../../avidemux_core/ADM_coreAudioFilter/src/audiofilterAPI.cpp \ 
 ../../../avidemux/qt4/ADM_openGL/src/ADM_openGl.cpp \ 
 ../../../avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/DIA_none.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_aspectRatio.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_bar.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_float.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_frame.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_hex.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_integer.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_matrix.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_notch.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_timeStamp.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_bitrate.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_button.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_filesel.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_menu.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_notch.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_openGL.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_QCanvas.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_QSlider.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_qtFactory.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_slider.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_threadCount.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_toggle.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/toolkit.cpp \ 
 ../../../avidemux/qt4/ADM_update/src/ADM_update.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_busy.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_none.cpp \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_jobProgress.cpp \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/filter_none.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/translator.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/OCR_none.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_calculator.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_none.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_calculator.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_busy.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/T_index_pg.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/filter_none.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_win32.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qtray.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_default.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_win32.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/FileAction.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/gui_none.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2GL.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2GL.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/gui_none.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/FileAction.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_default.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ui_support.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/qt4Shell.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ui_support.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_integer.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_menu.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_aspectRatio.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_slider.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_threadCount.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_QCanvas.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_qtFactory.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_float.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_notch.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_QSlider.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_hex.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/DIA_none.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_openGL.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_notch.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_button.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/toolkit.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_bitrate.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_bar.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_frame.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_toggle.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_filesel.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_timeStamp.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_matrix.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp \ 
+../../../avidemux/common/ADM_toolkit/automation.cpp \ 
+../../../avidemux/common/ADM_toolkit/filesel.cpp \ 
+../../../avidemux/common/ADM_toolkit/ADM_audioQueue.cpp \ 
+../../../avidemux/common/ADM_toolkit/ADM_packetQueue.cpp \ 
+../../../avidemux/common/gui_savenew.cpp \ 
+../../../avidemux/common/gui_play.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_8bits.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_audiocodec.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_codecwav.cpp \ 
-../../../avidemux/common/ADM_audioCodec/src/ADM_lpcm.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_pluginLoad.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_audioResample.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_linear.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_sinc.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_zoh.cpp \ 
+../../../avidemux/common/ADM_audioCodec/src/ADM_lpcm.cpp \ 
+../../../avidemux/common/ADM_videoEncoder/src/ADM_VideoEncoders.cpp \ 
+../../../avidemux/common/ADM_videoEncoder/src/ADM_dynVideoEncoder.cpp \ 
+../../../avidemux/common/gui_main.cpp \ 
+../../../avidemux/common/gui_action.cpp \ 
+../../../avidemux/common/ADM_render/GUI_simpleRenderStub.cpp \ 
+../../../avidemux/common/ADM_render/GUI_simpleRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_qtGlRender.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/vlc_dxva.c \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
+../../../avidemux/common/ADM_render/GUI_vdpauRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_sdlRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_render.cpp \ 
+../../../avidemux/common/ADM_render/GUI_libvaRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_dxva2Render.cpp \ 
+../../../avidemux/common/ADM_render/GUI_xvRender.cpp \ 
+../../../avidemux/common/gui_navigate.cpp \ 
+../../../avidemux/common/ADM_gettext.cpp \ 
+../../../avidemux/common/ADM_preview.cpp \ 
+../../../avidemux/common/ADM_script2/src/ADM_script.cpp \ 
+../../../avidemux/common/ADM_osSupport/ADM_misc.cpp \ 
+../../../avidemux/common/ADM_osSupport/ADM_crashHook.cpp \ 
+../../../avidemux/common/main.cpp \ 
+../../../avidemux/common/gui_blackframes.cpp \ 
+../../../avidemux/common/gui_save.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audio_encoderPlugin.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiocopy.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_SRC.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_interface.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_mixer.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_limiter.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_encoder.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_access.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_zoh.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_linear.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_sinc.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_encoder.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiocopy.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_film2pal.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_interface.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_limiter.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_mixer.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_SRC.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_thread.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_audioFilter.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_bitrateHisto.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_builtin.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_gototime.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_jobs_save.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_plugins.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_postproc.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_prefs.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edit.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edRender.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_audioResample.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_dynVideoDecoder.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp \ 
+../../../avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp \ 
+../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp \ 
+../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp \ 
 ../../../avidemux/common/ADM_editor/src/ADM_edSearch.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edStub.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_segment.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edActiveAudioTracks.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edPoolOfAudioTracks.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrack.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrack.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edEditableAudioTrack.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edPoolOfAudioTracks.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edFrameType.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edActiveAudioTracks.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edStub.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edRender.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_segment.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_edIdentify.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_edMarker.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp \ 
-../../../avidemux/common/ADM_gettext.cpp \ 
-../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp \ 
-../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp \ 
-../../../avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp \ 
-../../../avidemux/common/ADM_osSupport/ADM_crashHook.cpp \ 
-../../../avidemux/common/ADM_osSupport/ADM_misc.cpp \ 
-../../../avidemux/common/ADM_preview.cpp \ 
-../../../avidemux/common/ADM_previewNavigate.cpp \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/vlc_dxva.c \ 
-../../../avidemux/common/ADM_render/GUI_dxva2Render.cpp \ 
-../../../avidemux/common/ADM_render/GUI_libvaRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_qtGlRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_render.cpp \ 
-../../../avidemux/common/ADM_render/GUI_sdlRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_simpleRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_simpleRenderStub.cpp \ 
-../../../avidemux/common/ADM_render/GUI_vdpauRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_xvRender.cpp \ 
-../../../avidemux/common/ADM_script2/src/ADM_script.cpp \ 
-../../../avidemux/common/ADM_slave.cpp \ 
-../../../avidemux/common/ADM_toolkit/ADM_audioQueue.cpp \ 
-../../../avidemux/common/ADM_toolkit/ADM_packetQueue.cpp \ 
-../../../avidemux/common/ADM_toolkit/automation.cpp \ 
-../../../avidemux/common/ADM_toolkit/filesel.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_dynVideoDecoder.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp \ 
-../../../avidemux/common/ADM_videoEncoder/src/ADM_dynVideoEncoder.cpp \ 
-../../../avidemux/common/ADM_videoEncoder/src/ADM_VideoEncoders.cpp \ 
-../../../avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp \ 
-../../../avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edFrameType.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edit.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_builtin.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_audioFilter.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_jobs_save.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_gototime.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_prefs.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_plugins.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_bitrateHisto.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_postproc.cpp \ 
 ../../../avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp \ 
-../../../avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp \ 
 ../../../avidemux/common/ADM_videoFilter2/src/partial.conf \ 
 ../../../avidemux/common/ADM_videoFilter2/src/partial_desc.cpp \ 
 ../../../avidemux/common/ADM_videoFilter2/src/partial_json.cpp \ 
-../../../avidemux/common/gui_action.cpp \ 
+../../../avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp \ 
+../../../avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp \ 
+../../../avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp \ 
 ../../../avidemux/common/gui_autodrive.cpp \ 
-../../../avidemux/common/gui_blackframes.cpp \ 
 ../../../avidemux/common/GUI_jobs.cpp \ 
-../../../avidemux/common/gui_main.cpp \ 
-../../../avidemux/common/gui_navigate.cpp \ 
-../../../avidemux/common/gui_play.cpp \ 
-../../../avidemux/common/gui_save.cpp \ 
-../../../avidemux/common/gui_savenew.cpp \ 
-../../../avidemux/common/main.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bit_allocate.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/downmix.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/imdct.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/parse.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_amrnb/ADM_ad_amrnb.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_dca/ADM_dca.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ima_adpcm/ADM_ad_ima_adpcm.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/minimad.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ms_adpcm/ADM_ad_ms_adpcm.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrnb/ADM_ad_opencore_amrnb.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrwb/ADM_ad_opencore_amrwb.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opus/ADM_opus.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ulaw/ADM_ad_ulaw.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_check.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfAudio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfChunk.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxyAudio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvIndex.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp \ 
+../../../avidemux/common/ADM_slave.cpp \ 
+../../../avidemux/common/ADM_previewNavigate.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvAccessBuffered.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psComputeTimeStamp.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy_cli.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvIndex.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_picPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxfPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_regular.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsComputeTimeStamp.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsCrc.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsGetBits.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxfPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_regular.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_picPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy_cli.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummyPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlvConfig.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlvPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/3gp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ac3.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_amr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avc1.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avcC.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_chpl.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_colr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_d263.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dac3.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_damr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dref.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_elst.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_enca.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_encv.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_free.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftab.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsGetBits.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsCrc.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfChunk.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfAudio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxyAudio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/logo.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/crop.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asciiView/vf_matrix.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rte_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/testHeader.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_sse.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/dec_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_util.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/telec_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swresize_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swresize_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf \ 
+../../../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 \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_main.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render_api.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_strtod.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_blur.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer_c.c \ 
+../../../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.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffDv/ffDvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpegPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffVTEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/png/pngPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264_noui.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/null/nullPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/yv12/yv12Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huffPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264_misc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264_render.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264_packed.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ffMsMp4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ffFlv1Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265_noui.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffNvEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ffMpeg2Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ffMpeg4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer_desc.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftyp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_gmin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hdlr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hinf.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hnti.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_href.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdat.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_meta.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4s.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4v.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mvhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_nmhd.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ohdr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_pasp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_root.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_rtp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_vmhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_gmin.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_s263.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdtp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_smi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sound.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_standard.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stbl.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stdp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsz.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stz2.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_text.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tfhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tkhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdat.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_treftype.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_trun.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tx3g.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_udta.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_url.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_urn.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_uuid.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_video.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_vmhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/cmeta.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/isma.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tfhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftab.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hdlr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/CoverArtBox.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/generic.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/Tags.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/generic.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/type.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_url.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/log.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_urn.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stdp.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4container.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file_io.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4info.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_d263.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_rtp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hinf.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_uuid.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_root.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_enca.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_standard.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4v.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_chpl.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avc1.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4property.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tx3g.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_colr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/text.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4track.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_smi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_damr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_trun.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/coding.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/ColorParameterBox.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/PictureAspectRatioBox.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/text.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/ColorParameterBox.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_meta.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4info.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4s.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_amr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_video.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_href.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_elst.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mvhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/cmeta.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsz.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sound.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dac3.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avcC.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdtp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_udta.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tkhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_encv.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_nmhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stz2.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ac3.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/3gp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stbl.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hnti.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dref.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_text.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/isma.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_pasp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_free.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Plugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ac3strm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummyPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRawPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlvConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_json.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm_out.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/lpcmstrm_in.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexInput.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexOutput.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/dtsstrm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.c \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_logging.c \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/padstrm.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mthread.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_transfert.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexOutput.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/audiostrm_out.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/inputstrm.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.c \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/bits.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.c \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/decodebufmodel.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/dtsstrm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/inputstrm.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/interact.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/lpcmstrm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_logging.c \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mpastrm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.c \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/multiplexor.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/padstrm.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm_out.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg.c \ 
-../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRawPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ac3strm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mpastrm_in.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.conf \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.conf \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemuxAudio.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyTests.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/GUI_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyHelpers_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDialogFactory_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFToggle_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFMenu_gen.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/modules/re/init.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/modules/re/regexpr.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFInteger_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFMenu_gen.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFTimeStamp_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFToggle_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDialogFactory_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyHelpers_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/init_math.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/math.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.c.org \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tst/hello.cpp \ 
-../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp \ 
-../../../avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffDv/ffDvPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ffFlv1Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ffMpeg2Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ffMpeg4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ffMsMp4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffNvEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huffPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpegPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/null/nullPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/png/pngPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264_noui.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265_noui.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/yv12/yv12Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_main.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_util.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asciiView/vf_matrix.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_blur.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer_c.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render_api.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_strtod.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/crop.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/dec_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_sse.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_util.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/logo.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swresize_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rte_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/telec_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/testHeader.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/init_math.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.c.org \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyTests.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.conf \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-sdf.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-shaders.cc \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arc.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-blob.cc \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-extents.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-blob.cc \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-outline.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-sdf.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-shaders.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.conf \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader.conf \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.conf \ 
+../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ms_adpcm/ADM_ad_ms_adpcm.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ulaw/ADM_ad_ulaw.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrnb/ADM_ad_opencore_amrnb.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/minimad.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_amrnb/ADM_ad_amrnb.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opus/ADM_opus.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_dca/ADM_dca.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ima_adpcm/ADM_ad_ima_adpcm.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrwb/ADM_ad_opencore_amrwb.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/parse.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bit_allocate.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/imdct.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/downmix.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_check.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/opus/opus_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/opus/opus_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/opus/opus_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.conf \ 
 
 
 FORMS = \
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui \ 
-../../../avidemux/qt4/ADM_jobs/src/uiJobs.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui \ 
 ../../../avidemux/qt4/ADM_jobs/src/uiProgress.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui \ 
+../../../avidemux/qt4/ADM_jobs/src/uiJobs.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/mainfilter.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/processing.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/license.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/vobsub.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/audioTracks.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/calculator.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/working.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/jobs.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/license.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/processing.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/props.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/vobsub.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/working.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/mainfilter.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/ocr.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/shell.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/ocr.ui \ 
 
 
 TRANSLATIONS = \
 ./avidemux_ca.ts \ 
-./avidemux_cs.ts \ 
-./avidemux_da.ts \ 
-./avidemux_de.ts \ 
-./avidemux_el.ts \ 
-./avidemux_en.ts \ 
-./avidemux_es.ts \ 
-./avidemux_eu.ts \ 
 ./avidemux_fr.ts \ 
+./avidemux_es.ts \ 
 ./avidemux_hu.ts \ 
-./avidemux_it.ts \ 
-./avidemux_ja.ts \ 
+./avidemux_da.ts \ 
+./avidemux_zh_TW.ts \ 
 ./avidemux_ko.ts \ 
-./avidemux_pl.ts \ 
+./avidemux_sr.ts \ 
 ./avidemux_pt_BR.ts \ 
 ./avidemux_ru.ts \ 
-./avidemux_sr.ts \ 
+./avidemux_zh_CN.ts \ 
+./avidemux_eu.ts \ 
+./avidemux_el.ts \ 
 ./avidemux_sr@latin.ts \ 
+./avidemux_pl.ts \ 
+./avidemux_it.ts \ 
+./avidemux_en.ts \ 
+./avidemux_cs.ts \ 
+./avidemux_ja.ts \ 
+./avidemux_de.ts \ 
 ./avidemux_tr.ts \ 
-./avidemux_zh_TW.ts \

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts Changed

@@ -3735,7 +3735,7 @@
 <translation type="obsolete">Potser es refereix a un fitxer d&apos;índex antic.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Ha fallat l&apos;intent d&apos;obrir %s!</translation>
 </message>
@@ -3825,19 +3825,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -5412,7 +5452,7 @@
 <translation type="obsolete">&lt;b&gt;Vídeo&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Copiat</translation>
@@ -5463,7 +5503,7 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -5480,12 +5520,12 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation type="unfinished">Temps:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -5514,7 +5554,7 @@
 <translation type="unfinished">000000</translation>
 </message>
 <message>
- <location line="-1414"/>
+ <location line="-1417"/>
 <source>&amp;Help</source>
 <translation type="unfinished">Aj&amp;uda</translation>
 </message>
@@ -5575,7 +5615,7 @@
 <translation type="obsolete">Au&amp;to</translation>
 </message>
 <message>
- <location line="+1545"/>
+ <location line="+1544"/>
 <source>&amp;Open...</source>
 <translation type="unfinished">&amp;Obre</translation>
 </message>
@@ -5681,7 +5721,7 @@
 <translation type="obsolete">Desa una imatge com a JPEG</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished">Carrega / &amp;Executa un projecte</translation>
 </message>
@@ -6091,12 +6131,12 @@
 <translation type="obsolete">Ctrl+W</translation>
 </message>
 <message>
- <location line="-1143"/>
+ <location line="-1152"/>
 <source>ms</source>
 <translation type="unfinished">ms</translation>
 </message>
 <message>
- <location line="+763"/>
+ <location line="+764"/>
 <source>A:</source>
 <translation type="unfinished">A:</translation>
 </message>
@@ -6179,7 +6219,7 @@
 <translation type="unfinished">Tipus fotograma: </translation>
 </message>
 <message>
- <location line="-1244"/>
+ <location line="-1247"/>
 <source>&amp;Toolbars</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6194,7 +6234,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6210,7 +6250,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6220,18 +6260,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+212"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6306,7 +6346,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+178"/>
+ <location line="+179"/>
 <source>Se&amp;lection</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6321,22 +6361,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6346,7 +6386,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+107"/>
+ <location line="+119"/>
 <source>&amp;Codec Options</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6775,6 +6815,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -6974,6 +7022,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -7487,7 +7540,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7521,7 +7574,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished">Vora _esquerra:</translation>
 </message>
@@ -7592,7 +7645,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7601,14 +7654,13 @@
 <translation type="obsolete">_Usa la safata de sistema en codificar</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">_Permet freq. d&apos;àudio no estàndard per a DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">Crea fitxers d&apos;_OpenDML</translation>
+ <translation type="obsolete">Crea fitxers d&apos;_OpenDML</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7733,16 +7785,21 @@
 <translation type="unfinished">Priorització</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished">_Usa etiqueta (tag) alternativa per a MP3 en MP4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">Xv (millor)</translation>
@@ -7784,7 +7841,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -7871,10 +7928,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Àudio</translation>
 </message>
@@ -7888,7 +7945,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">CPU</translation>
 </message>
@@ -7903,7 +7960,7 @@
 <translation type="unfinished">Preferències</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+41"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+43"/>
 <source>Close</source>
 <translation type="unfinished">Tanca</translation>
 </message>
@@ -7942,7 +7999,7 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">Filtres</translation>
 </message>
@@ -8190,7 +8247,7 @@
 <translation type="unfinished">S&apos;ha produït un error de còdec</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">No s&apos;ha codificat en aquesta versió</translation>
 </message>
@@ -8203,12 +8260,41 @@
 <translation type="obsolete">Seleccioneu un fitxer d&apos;AVI per afegir</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">N&apos;esteu segur?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">S&apos;ha produït un error sobre permisos</translation>
 </message>
@@ -8304,7 +8390,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">Alguna cosa no ha funcionat</translation>
 </message>
@@ -8319,7 +8405,7 @@
 <translation type="unfinished">Pista principal d&apos;àudio</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">AvsProxy</translation>
 </message>
@@ -8351,7 +8437,7 @@
 <translation type="unfinished">Bolcat hexadecimal fotograma</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+34"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
 <source>Go to Time</source>
 <translation type="unfinished">Salta al temps</translation>
 </message>
@@ -8371,7 +8457,7 @@
 <translation type="unfinished">Elimina l&apos;efecte &quot;_ringing&quot;</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Seleccioneu una tasca per desar.</translation>
 </message>
@@ -8396,7 +8482,7 @@
 <translation type="unfinished">Seleccioneu un fitxer de JPEG per desar.</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation type="unfinished">Seleccioneu un fitxer per desar.</translation>
 </message>
@@ -8406,39 +8492,36 @@
 <translation type="unfinished">S&apos;està desant l&apos;àudio.</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">S&apos;estan desant com a grup de JPEG.</translation>
+ <translation type="obsolete">S&apos;estan desant com a grup de JPEG.</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">No es pot descodificar el fotograma.</translation>
+ <translation type="obsolete">No es pot descodificar el fotograma.</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">S&apos;està cancel·lant.</translation>
+ <translation type="obsolete">S&apos;està cancel·lant.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Fet</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">S&apos;han desat %d imatges.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -8449,12 +8532,11 @@
 <translation type="unfinished">Error</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">No s&apos;han pogut desar totes les imatges.</translation>
+ <translation type="obsolete">No s&apos;han pogut desar totes les imatges.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Ha fallat l&apos;operació de BMP.</translation>
 </message>
@@ -8464,7 +8546,7 @@
 <translation type="unfinished">El desament de %s com a fitxer de BMP ha fallat.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">El fitxer %s s&apos;ha desat satisfactòriament.</translation>
 </message>
@@ -8716,11 +8798,16 @@
 <translation type="unfinished">Guany</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished">S&apos;està desant</translation>
 </message>
 <message>
+ <location line="+165"/>
+ <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/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
 <source>DRC</source>
 <translation type="unfinished"></translation>
@@ -8796,7 +8883,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8811,27 +8898,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable openGl support</source>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>If you use Hw decoding, it is better to use the matching display driver</source>
+ <location line="+2"/>
+ <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
- <source>_Check for new release</source>
+ <location line="+2"/>
+ <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
- <source>_Split MPEG files every (MB):</source>
+ <location line="+7"/>
+ <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+65"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8882,12 +8969,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8897,7 +8985,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
 <source>Open</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8930,10 +9018,20 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>Information</source>
 <translation type="unfinished"></translation>
@@ -9005,7 +9103,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9100,8 +9203,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -9178,7 +9281,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9203,7 +9306,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -9224,7 +9327,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9234,7 +9345,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -9265,7 +9376,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Caram!</translation>
 </message>
@@ -9275,12 +9386,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">S&apos;ha produït un problema en inicialitzar el dispositiu d&apos;àudio</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation type="unfinished">No</translation>
 </message>
@@ -9315,7 +9426,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -9331,17 +9447,47 @@
 <translation type="unfinished">Ha fallat el desament.</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9733,26 +9879,21 @@
 <translation type="unfinished">Còdec desconegut</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">S&apos;ha produït un error de memòria</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
 <source>Unknown</source>
@@ -9845,7 +9986,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -9873,6 +10014,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -10262,16 +10447,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10440,7 +10625,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10450,7 +10635,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10649,13 +10834,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Contrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10779,7 +10964,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -10790,6 +10975,11 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -10801,40 +10991,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished">Dreta:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished">Amunt:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished">Reinicialitza</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished">Avall:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished">Esquerra:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished">Tall automàtic</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -11067,40 +11267,42 @@
 <translation type="unfinished">S&apos;està codificant...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation type="unfinished">Fase:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
 <translation type="unfinished">Còdec de vídeo:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Cap</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Desconegut</translation>
 </message>
 <message>
+ <location line="+14"/>
 <source>Container:</source>
- <translation type="obsolete">Contenidor:</translation>
+ <translation type="unfinished">Contenidor:</translation>
 </message>
 <message>
+ <location line="-21"/>
 <source>Audio Codec:</source>
- <translation type="obsolete">Còdec d&apos;àudio:</translation>
+ <translation type="unfinished">Còdec d&apos;àudio:</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+141"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
@@ -11110,59 +11312,68 @@
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
+ <location line="-7"/>
 <source>Elapsed:</source>
- <translation type="obsolete">Transcorregut:</translation>
+ <translation type="unfinished">Transcorregut:</translation>
 </message>
 <message>
+ <location line="-379"/>
 <source>Time Remaining:</source>
- <translation type="obsolete">Temps restant:</translation>
+ <translation type="unfinished">Temps restant:</translation>
 </message>
 <message>
+ <location line="+400"/>
 <source>Frames/sec:</source>
- <translation type="obsolete">Fotogrames/s:</translation>
+ <translation type="unfinished">Fotogrames/s:</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 MB</translation>
 </message>
 <message>
+ <location line="-28"/>
 <source>Total Size:</source>
- <translation type="obsolete">Mida total:</translation>
+ <translation type="unfinished">Mida total:</translation>
 </message>
 <message>
+ <location line="-7"/>
 <source>Audio Size:</source>
- <translation type="obsolete">Mida de l&apos;àudio:</translation>
+ <translation type="unfinished">Mida de l&apos;àudio:</translation>
 </message>
 <message>
+ <location line="+28"/>
 <source>Video Size:</source>
- <translation type="obsolete">Mida del vídeo:</translation>
+ <translation type="unfinished">Mida del vídeo:</translation>
 </message>
 <message>
+ <location line="+61"/>
 <source>Processed Frames:</source>
- <translation type="obsolete">Fotogram. processats:</translation>
+ <translation type="unfinished">Fotogram. processats:</translation>
 </message>
 <message>
 <source>Total Frames:</source>
 <translation type="obsolete">Fotogram. totals:</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+14"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 kB/s</translation>
 </message>
 <message>
+ <location line="-31"/>
 <source>Average Bitrate:</source>
- <translation type="obsolete">Taxa de bits mitjana:</translation>
+ <translation type="unfinished">Taxa de bits mitjana:</translation>
 </message>
 <message>
+ <location line="+24"/>
 <source>Quantiser:</source>
- <translation type="obsolete">Quantificador:</translation>
+ <translation type="unfinished">Quantificador:</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-320"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">Apaga l&apos;ordinador en acabar</translation>
 </message>
@@ -11207,103 +11418,15 @@
 <translation type="unfinished">Avançat</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+48"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="+129"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -11349,7 +11472,7 @@
 <translation type="unfinished">Ajusta el contrast, la lluminositat, la saturació i la gamma.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11435,6 +11558,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -11478,41 +11606,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished">Fade</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">En negre</translation>
 </message>
@@ -11532,18 +11660,18 @@
 <translation type="unfinished">Fosa en blanc</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">_Tipus de fosa:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -12059,8 +12187,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -12101,6 +12229,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -12109,6 +12252,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -12122,7 +12270,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12262,6 +12430,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -13063,7 +13289,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -13589,6 +13815,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -13619,18 +13850,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -13938,12 +14169,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13953,7 +14184,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14040,7 +14276,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Hi ha hagut un problema en la lectura d&apos;encapçalaments d&apos;SVQ3</translation>
 </message>
@@ -14052,7 +14288,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">No está suportat</translation>
@@ -14068,7 +14304,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14078,7 +14314,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14088,6 +14324,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -14286,12 +14532,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Error</translation>
 </message>
@@ -14388,7 +14634,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">L&apos;encapçalament és malformat</translation>
 </message>
@@ -14401,13 +14647,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -14622,7 +14868,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Error</translation>
 </message>
@@ -14651,18 +14897,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Error</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14687,7 +14933,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14707,7 +14953,7 @@
 <translation type="unfinished">Calen privilegis de root per realitzar aquesta operació.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14765,7 +15011,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14775,7 +15021,7 @@
 <translation type="unfinished">Projectes recents</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14840,7 +15086,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -14851,7 +15097,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14999,7 +15245,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Partial</translation>
 </message>
@@ -15039,7 +15285,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15075,7 +15321,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">No</translation>
 </message>
@@ -15095,7 +15341,7 @@
 <translation type="unfinished">Estèreo</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15171,18 +15417,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15309,7 +15555,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Mode:</translation>
 </message>
@@ -15324,7 +15570,7 @@
 <translation type="unfinished">Resample fps</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation type="unfinished">Personalitzat</translation>
 </message>
@@ -15367,7 +15613,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Ni l&apos;amplada ni l&apos;alçària no poden ser senars</translation>
 </message>
@@ -15430,7 +15676,6 @@
 <translation type="unfinished">Bloqueja la relació d&apos;aspecte</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -15447,8 +15692,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -15473,8 +15716,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -15499,8 +15740,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -15524,7 +15763,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -15538,7 +15776,23 @@
 <translation type="unfinished">Destinació:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -15951,6 +16205,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -16148,6 +16426,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -16161,16 +16457,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">S&apos;està indexant</translation>
@@ -16192,7 +16488,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16241,6 +16537,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -16274,24 +16591,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -16650,7 +16949,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16696,7 +16995,7 @@
 <translation type="unfinished">Taxa de bits mitjana:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -16714,7 +17013,7 @@
 Voleu continuar?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -17841,8 +18140,8 @@
 </message>
 <message>
 <location line="-2343"/>
- <source>10 (Best)</source>
- <translation type="unfinished">9 (Millor) {10 ?}</translation>
+ <source>11 (Best)</source>
+ <translation type="unfinished">11 (Millor)</translation>
 </message>
 <message>
 <location line="+563"/>
@@ -18203,7 +18502,7 @@
 <translation type="unfinished">Personalitzat</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Taxa de bits sortida:</translation>
 </message>
@@ -18334,12 +18633,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">Esborra</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished">General</translation>
 </message>
@@ -18519,12 +18818,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished">Quantificador</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished">51 (Qualitat baixa)</translation>
@@ -18561,12 +18860,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished">fotogrames</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished">Identificador del set de paràmetres de seqüència:</translation>
 </message>
@@ -18864,7 +19163,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished">Matriu de quantificació</translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts Changed

@@ -7579,7 +7579,7 @@
 <translation type="obsolete">Může to být starým indexovým souborem.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Selhalo otevření %s!</translation>
 </message>
@@ -7684,19 +7684,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -10082,7 +10122,7 @@
 <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Kopie</translation>
@@ -10128,7 +10168,7 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -10145,12 +10185,12 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation type="unfinished">Čas:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -10179,7 +10219,7 @@
 <translation type="unfinished">000000</translation>
 </message>
 <message>
- <location line="-1414"/>
+ <location line="-1417"/>
 <source>&amp;Help</source>
 <translation type="unfinished">Náp&amp;ověda</translation>
 </message>
@@ -10240,7 +10280,7 @@
 <translation type="obsolete">Au&amp;to</translation>
 </message>
 <message>
- <location line="+1545"/>
+ <location line="+1544"/>
 <source>&amp;Open...</source>
 <translation type="unfinished">&amp;Otevřít...</translation>
 </message>
@@ -10313,7 +10353,7 @@
 <translation type="obsolete">Uložit JPEG obrázek</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished">N&amp;ačíst/spustit projekt...</translation>
 </message>
@@ -10660,22 +10700,22 @@
 <translation type="unfinished">&amp;Na sebe</translation>
 </message>
 <message>
- <location line="-1641"/>
+ <location line="-1650"/>
 <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1125"/>
+ <location line="+1126"/>
 <source>Frame type:</source>
 <translation type="unfinished">Typ snímku:</translation>
 </message>
 <message>
- <location line="+504"/>
+ <location line="+512"/>
 <source>&amp;Separate</source>
 <translation type="unfinished">S&amp;amostatně</translation>
 </message>
 <message>
- <location line="-1143"/>
+ <location line="-1152"/>
 <source>ms</source>
 <translation type="unfinished">ms</translation>
 </message>
@@ -10688,7 +10728,7 @@
 <translation type="obsolete">Uložit výběr jako JPEG obrázky...</translation>
 </message>
 <message>
- <location line="+763"/>
+ <location line="+764"/>
 <source>A:</source>
 <translation type="unfinished">A:</translation>
 </message>
@@ -10758,7 +10798,7 @@
 <translation type="obsolete">Video CD</translation>
 </message>
 <message>
- <location line="-1375"/>
+ <location line="-1378"/>
 <source>&amp;Toolbars</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10773,7 +10813,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10789,7 +10829,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10799,18 +10839,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+212"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10885,7 +10925,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+178"/>
+ <location line="+179"/>
 <source>Se&amp;lection</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10900,22 +10940,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10930,7 +10970,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+69"/>
 <source>F7</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11369,6 +11409,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -11598,6 +11646,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -12111,7 +12164,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -12145,7 +12198,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished">_Levý okraj:</translation>
 </message>
@@ -12216,7 +12269,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12225,14 +12278,13 @@
 <translation type="obsolete">_Pohltit do panelu při kódování</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">P_ovolit nestandardní frekvenci zvuku pro DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">_Vytvářet OpenDML soubory</translation>
+ <translation type="obsolete">_Vytvářet OpenDML soubory</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -12345,22 +12397,21 @@
 <translation type="unfinished">Priority</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Split MPEG files every (MB):</source>
- <translation type="unfinished">_Rozdělovat MPEG soubory každých (MB):</translation>
+ <translation type="obsolete">_Rozdělovat MPEG soubory každých (MB):</translation>
 </message>
 <message>
- <location line="+2"/>
+ <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>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (nejlepší)</translation>
 </message>
@@ -12401,7 +12452,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -12482,10 +12533,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Audio</translation>
 </message>
@@ -12499,7 +12550,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">CPU</translation>
 </message>
@@ -12519,7 +12570,7 @@
 <translation type="unfinished">Uložit</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+7"/>
 <source>Close</source>
 <translation type="unfinished">Zavřít</translation>
 </message>
@@ -12552,7 +12603,7 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">Filtry</translation>
 </message>
@@ -12836,7 +12887,7 @@
 To je potřeba k vytvoření PSP kompatibilního videa.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Nepodporováno v této verzi</translation>
 </message>
@@ -12849,12 +12900,41 @@
 <translation type="obsolete">Vyberte AVI soubor k připojení...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Určitě?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">Chyba oprávnění</translation>
 </message>
@@ -12935,7 +13015,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">Přihodilo se něco zlého</translation>
 </message>
@@ -12950,7 +13030,7 @@
 <translation type="unfinished">Hlavní audio stopa</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">AvsProxy</translation>
 </message>
@@ -12982,7 +13062,7 @@
 <translation type="unfinished">Hex výpis snímků</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+34"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
 <source>Go to Time</source>
 <translation type="unfinished">Přejít na čas</translation>
 </message>
@@ -13002,7 +13082,7 @@
 <translation type="unfinished">_Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Zvolte projekt k uložení</translation>
 </message>
@@ -13027,7 +13107,7 @@
 <translation type="unfinished">Vyberte JPEG soubor k uložení</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation type="unfinished">Zvolte soubor k uložení</translation>
 </message>
@@ -13037,39 +13117,36 @@
 <translation type="unfinished">Ukládá se zvuk</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Ukládám jako sadu JPEG souborů</translation>
+ <translation type="obsolete">Ukládám jako sadu JPEG souborů</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">Nelze dekódovat snímek</translation>
+ <translation type="obsolete">Nelze dekódovat snímek</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">Ukončeno.</translation>
+ <translation type="obsolete">Ukončeno.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Hotovo</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">Počet uložených obrázků: %d.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -13080,12 +13157,11 @@
 <translation type="unfinished">Chyba</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">Nelze uložit všechny obrázky.</translation>
+ <translation type="obsolete">Nelze uložit všechny obrázky.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP operace selhala</translation>
 </message>
@@ -13095,7 +13171,7 @@
 <translation type="unfinished">Uložení %s jako BMP souboru selhalo.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">Soubor %s byl úspěšně uložen.</translation>
 </message>
@@ -13592,11 +13668,16 @@
 <translation type="obsolete">Tento skript již byl úspěšně vykonán.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished">Ukládání</translation>
 </message>
 <message>
+ <location line="+165"/>
+ <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/ADM_commonUI/DIA_audioFilter.cpp" line="-51"/>
 <location line="+25"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-85"/>
@@ -13605,7 +13686,7 @@
 </message>
 <message>
 <location line="-14"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-139"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-144"/>
 <source>Stereo</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13685,7 +13766,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-148"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13700,17 +13781,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13727,7 +13813,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+23"/>
+ <location line="+13"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13778,12 +13869,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13793,7 +13885,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
 <source>Open</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13821,10 +13913,20 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>Information</source>
 <translation type="unfinished"></translation>
@@ -13902,7 +14004,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13997,8 +14104,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -14043,7 +14150,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14068,7 +14175,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -14089,7 +14196,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14099,7 +14214,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+72"/>
+ <location line="+113"/>
 <source>Cannot open &quot;%s&quot;.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14145,7 +14260,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Ouha</translation>
 </message>
@@ -14155,12 +14270,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <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="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation type="unfinished">Ne</translation>
 </message>
@@ -14195,7 +14310,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -14211,17 +14331,47 @@
 <translation type="unfinished">Uložení se nezdařilo</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14443,26 +14593,21 @@
 <translation type="unfinished">Neznámý kodek</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Chyba paměti</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
 <source>Unknown</source>
@@ -14555,7 +14700,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -14583,6 +14728,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -14972,16 +15161,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15150,7 +15339,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15160,7 +15349,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15359,13 +15548,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15487,7 +15676,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -15498,6 +15687,11 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -15509,40 +15703,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished">Vpravo:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished">Nahoře:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished">Vrátit</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished">Dole:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished">Vlevo:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished">Automatický ořez</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -15775,40 +15979,42 @@
 <translation type="unfinished">Probíhá kódování...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation type="unfinished">Fáze:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
 <translation type="unfinished">Video kodek:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Nic</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Neznámý</translation>
 </message>
 <message>
+ <location line="+14"/>
 <source>Container:</source>
- <translation type="obsolete">Kontejner:</translation>
+ <translation type="unfinished">Kontejner:</translation>
 </message>
 <message>
+ <location line="-21"/>
 <source>Audio Codec:</source>
- <translation type="obsolete">Audio kodek:</translation>
+ <translation type="unfinished">Audio kodek:</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+141"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
@@ -15818,59 +16024,68 @@
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
+ <location line="-7"/>
 <source>Elapsed:</source>
- <translation type="obsolete">Uplynulý čas:</translation>
+ <translation type="unfinished">Uplynulý čas:</translation>
 </message>
 <message>
+ <location line="-379"/>
 <source>Time Remaining:</source>
- <translation type="obsolete">Zbývající čas:</translation>
+ <translation type="unfinished">Zbývající čas:</translation>
 </message>
 <message>
+ <location line="+400"/>
 <source>Frames/sec:</source>
- <translation type="obsolete">Snímků za sekundu:</translation>
+ <translation type="unfinished">Snímků za sekundu:</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 MB</translation>
 </message>
 <message>
+ <location line="-28"/>
 <source>Total Size:</source>
- <translation type="obsolete">Celková velikost:</translation>
+ <translation type="unfinished">Celková velikost:</translation>
 </message>
 <message>
+ <location line="-7"/>
 <source>Audio Size:</source>
- <translation type="obsolete">Velikost zvuku:</translation>
+ <translation type="unfinished">Velikost zvuku:</translation>
 </message>
 <message>
+ <location line="+28"/>
 <source>Video Size:</source>
- <translation type="obsolete">Velikost videa:</translation>
+ <translation type="unfinished">Velikost videa:</translation>
 </message>
 <message>
+ <location line="+61"/>
 <source>Processed Frames:</source>
- <translation type="obsolete">Zpracované snímky:</translation>
+ <translation type="unfinished">Zpracované snímky:</translation>
 </message>
 <message>
 <source>Total Frames:</source>
 <translation type="obsolete">Celkový počet snímků:</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+14"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 kB/s</translation>
 </message>
 <message>
+ <location line="-31"/>
 <source>Average Bitrate:</source>
- <translation type="obsolete">Průměrný datový tok:</translation>
+ <translation type="unfinished">Průměrný datový tok:</translation>
 </message>
 <message>
+ <location line="+24"/>
 <source>Quantiser:</source>
- <translation type="obsolete">Kvantizér:</translation>
+ <translation type="unfinished">Kvantizér:</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-320"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">Po ukončení vypnout počítač</translation>
 </message>
@@ -15910,108 +16125,20 @@
 <translation type="unfinished">Pozastavit / Ukončit</translation>
 </message>
 <message>
- <location line="-158"/>
+ <location line="-149"/>
 <source>Main</source>
 <translation type="unfinished">Hlavní</translation>
 </message>
 <message>
- <location line="+171"/>
+ <location line="+162"/>
 <source>Advanced</source>
 <translation type="unfinished">Pokročilé</translation>
 </message>
 <message>
- <location line="-123"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="-33"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -16057,7 +16184,7 @@
 <translation type="unfinished">Úprava kontrastu, jasu, sytosti a gama.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16143,6 +16270,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -16186,41 +16318,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished">Fade</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Do ztracena</translation>
 </message>
@@ -16240,18 +16372,18 @@
 <translation type="unfinished">Postupný náběh</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">_Typ přechodu:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -16772,8 +16904,8 @@
 <translation type="unfinished">Nastavení libavcodec MPEG-4</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -16814,6 +16946,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -16822,6 +16969,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -16835,7 +16987,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16970,6 +17142,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -17771,7 +18001,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -18301,6 +18531,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -18331,18 +18566,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -18650,12 +18885,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18665,7 +18900,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18752,7 +18992,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Chyba čtení hlavičky SVQ3</translation>
 </message>
@@ -18764,7 +19004,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">Nepodporováno</translation>
@@ -18780,7 +19020,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18790,7 +19030,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18800,6 +19040,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -19002,12 +19252,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Chyba</translation>
 </message>
@@ -19104,7 +19354,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Špatná hlavička</translation>
 </message>
@@ -19128,13 +19378,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -19408,7 +19658,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Chyba</translation>
 </message>
@@ -19437,18 +19687,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Chyba</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19473,7 +19723,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19493,7 +19743,7 @@
 <translation type="unfinished">K této akci jsou vyžadována práva roota.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19551,7 +19801,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19561,7 +19811,7 @@
 <translation type="unfinished">Nedávné projekty</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19626,7 +19876,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -19637,7 +19887,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19785,7 +20035,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Částečný</translation>
 </message>
@@ -19825,7 +20075,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19861,7 +20111,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">Ne</translation>
 </message>
@@ -19877,12 +20127,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19958,7 +20208,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished">%s (%u:%u)</translation>
 </message>
@@ -20095,7 +20345,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Režim:</translation>
 </message>
@@ -20110,7 +20360,7 @@
 <translation type="unfinished">Resample fps</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation type="unfinished">Vlastní</translation>
 </message>
@@ -20153,7 +20403,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Šířka a výška nemohou být liché</translation>
 </message>
@@ -20216,7 +20466,6 @@
 <translation type="unfinished">Zamknout poměr stran</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -20233,8 +20482,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -20259,8 +20506,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -20285,8 +20530,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -20310,7 +20553,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -20324,7 +20566,23 @@
 <translation type="unfinished">Cíl:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -20733,6 +20991,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -20930,6 +21212,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -20943,16 +21243,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished"></translation>
@@ -20974,7 +21274,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished">X11</translation>
 </message>
@@ -21023,6 +21323,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -21056,24 +21377,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -21425,7 +21728,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -21471,7 +21774,7 @@
 <translation type="unfinished">Průměrný datový tok:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -21489,7 +21792,7 @@
 Chcete pokračovat?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -22060,8 +22363,8 @@
 </message>
 <message>
 <location line="-2187"/>
- <source>10 (Best)</source>
- <translation type="unfinished">9 (nejlepší) {10 ?}</translation>
+ <source>11 (Best)</source>
+ <translation type="unfinished">11 (nejlepší)</translation>
 </message>
 <message>
 <location line="+563"/>
@@ -22986,7 +23289,7 @@
 <translation type="unfinished">Vlastní</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Cílový datový tok:</translation>
 </message>
@@ -23117,12 +23420,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished">Obecné</translation>
 </message>
@@ -23302,12 +23605,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished">Kvantizér</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished">51 (nízká kvalita)</translation>
@@ -23344,12 +23647,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished">snímků</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -23647,7 +23950,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished">Kvantizační matice</translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_da.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_da.ts Changed

@@ -4,7 +4,17 @@
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+69"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation>Dekoderer video...</translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -16,12 +26,12 @@
 Det sker ved nogle optager-software.
 Hvis du genkoder video bør vi droppe disse informationer,
 ellers kan det forårsage mistede billeder/hakkende video.
-Hvis du blot kopiér videoen uden genkodning,
+Hvis du blot kopierer videoen uden genkodning,
 bør du beholde dem.
 Drop timinginformationer?</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
 <source>Cannot find a demuxer for %s</source>
 <translation>Kan ikke finde en demuxer for %s</translation>
 </message>
@@ -31,7 +41,37 @@
 <translation>Forsøg på at åbne %s fejlede!</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+22"/>
+ <source>width</source>
+ <translation>bredden</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation>%shøjden</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation> og </translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation>%sforskellig mellem den første og denne video</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation> er </translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation> er </translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
@@ -40,9 +80,9 @@
 2.) sæt dem sammen</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-18"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
 <source>Checking if timestamps are valid..</source>
- <translation>Tjekker om tidsstempler er gyldige..</translation>
+ <translation>Tjekker om tidsstempler er gyldige...</translation>
 </message>
 </context>
 <context>
@@ -509,7 +549,7 @@
 <translation type="vanished">&lt;b&gt;Video-dekoder&lt;b&gt;</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+154"/>
 <location line="+7"/>
 <source>XXXX</source>
 <translation>XXXX</translation>
@@ -540,7 +580,7 @@
 <translation>Filtre</translation>
 </message>
 <message>
- <location line="-112"/>
+ <location line="-128"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation>&lt;b&gt;Lyd-output&lt;/b&gt;</translation>
 </message>
@@ -550,7 +590,7 @@
 <translation> (0 spor)</translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation>&amp;Forskyd:</translation>
 </message>
@@ -578,17 +618,17 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation>...</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation>Tid:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation>00:00:00,000</translation>
 </message>
@@ -624,7 +664,12 @@
 <translation>000000</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location line="+13"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+155"/>
 <source>&amp;Open...</source>
 <translation>&amp;Åbn...</translation>
 </message>
@@ -650,7 +695,7 @@
 <translation>Gem video</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation>&amp;Indlæs/kør projekt...</translation>
 </message>
@@ -702,18 +747,18 @@
 <translation>Ctrl+Alt+C</translation>
 </message>
 <message>
- <location line="-926"/>
- <location line="+937"/>
+ <location line="-935"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation>&amp;Navigation</translation>
 </message>
 <message>
- <location line="-1572"/>
+ <location line="-1581"/>
 <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1575"/>
+ <location line="+1584"/>
 <source>Ctrl+Alt+N</source>
 <translation>Ctrl+Alt+N</translation>
 </message>
@@ -763,7 +808,7 @@
 <translation>Si&amp;de</translation>
 </message>
 <message>
- <location line="-1686"/>
+ <location line="-1695"/>
 <source>Codec O&amp;ptions</source>
 <translation>Codec-&amp;valgmuligheder</translation>
 </message>
@@ -843,7 +888,7 @@
 <translation>Fremad ét minut</translation>
 </message>
 <message>
- <location line="+178"/>
+ <location line="+179"/>
 <source>Se&amp;lection</source>
 <translation>&amp;Markering</translation>
 </message>
@@ -858,17 +903,16 @@
 <translation>Gå til markør B [PAGE DOWN]</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>Display output video on playback</source>
- <translation>Vis output-video under afspilning</translation>
+ <translation type="vanished">Vis output-video under afspilning</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation>Afspil filtreret</translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation>&amp;Lydstyrke</translation>
 </message>
@@ -884,6 +928,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>SpiderMonkeyShell</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
@@ -920,6 +972,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation>...</translation>
 </message>
@@ -948,7 +1005,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -974,7 +1031,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>_Venstre kant:</translation>
 </message>
@@ -1034,7 +1091,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+435"/>
+ <location filename="../../common/gui_save.cpp" line="+599"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation>Sæt i kø</translation>
@@ -1051,11 +1108,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation>Gem som JPEG</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>Luk</translation>
 </message>
@@ -1129,7 +1196,7 @@
 <translation>Sæt markør B</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+505"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+511"/>
 <source>Preferences</source>
 <translation>Præferencer</translation>
 </message>
@@ -1145,12 +1212,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>Filtre</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>Vælg spor</translation>
 </message>
@@ -1313,7 +1385,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-139"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-144"/>
 <source>Stereo</source>
 <translation>Stereo</translation>
 </message>
@@ -1454,7 +1526,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+121"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1490,13 +1562,13 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-163"/>
+ <location filename="../../common/gui_save.cpp" line="-320"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation>Lyd</translation>
 </message>
@@ -1566,19 +1638,18 @@
 <translation>Pluginsinfo</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-236"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-232"/>
 <source>Enable openGl support</source>
 <translation>Aktivér understøttelse af OpenGL</translation>
 </message>
 <message>
- <location line="+6"/>
+ <location line="+5"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Acceptér ikke-standard lydfrekvens for DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation>Opret _OpenDML-filer</translation>
+ <translation type="vanished">Opret _OpenDML-filer</translation>
 </message>
 <message>
 <location line="+2"/>
@@ -1698,22 +1769,21 @@
 <translation>Prioritering</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Split MPEG files every (MB):</source>
- <translation>_Opdel MPEG-filer hver (MB):</translation>
+ <translation type="vanished">_Opdel MPEG-filer hver (MB):</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation>_Brug alternativt mærkat for MP3 i .mp4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <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="+5"/>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation>XVideo (bedste)</translation>
 </message>
@@ -1759,7 +1829,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -1844,7 +1914,7 @@
 <translation>Video</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+48"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+53"/>
 <source>Threading</source>
 <translation>Trådning</translation>
 </message>
@@ -1906,7 +1976,7 @@
 Det er nødvendigt for at kunne oprette PSP-kompatibel video.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+188"/>
+ <location filename="../../common/gui_main.cpp" line="+189"/>
 <source>Select script to save</source>
 <translation>Vælg script som skal gemmes</translation>
 </message>
@@ -1916,17 +1986,53 @@
 <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="+97"/>
+ <location line="+101"/>
 <source>Not coded in this version</source>
 <translation>Ikke kodet i denne version</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+196"/>
+ <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"/>
 <source>Are you sure?</source>
 <translation>Er du sikker?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation>Tilladelsesfejl</translation>
 </message>
@@ -2015,7 +2121,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation>Noget gik galt</translation>
 </message>
@@ -2030,7 +2136,7 @@
 <translation>Hovedlydspor</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation>AvsProxy</translation>
 </message>
@@ -2062,7 +2168,7 @@
 <translation>Billede hex-dump</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation>Tidsstempel:</translation>
 </message>
@@ -2087,7 +2193,7 @@
 <translation>_Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-241"/>
+ <location filename="../../common/gui_save.cpp" line="-247"/>
 <source>Output file</source>
 <translation>Output-fil</translation>
 </message>
@@ -2127,6 +2233,11 @@
 <translation>Vælg den JPEG som skal gemmes</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation>Vælg den fil som skal gemmes</translation>
@@ -2137,49 +2248,45 @@
 <translation>Gemmer lyd</translation>
 </message>
 <message>
- <location line="+148"/>
+ <location line="+211"/>
 <source>Jpeg</source>
 <translation>JPEG</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Fail to save as jpeg</source>
- <translation>Kunne ikke gemme som JPEG</translation>
+ <translation type="vanished">Kunne ikke gemme som JPEG</translation>
 </message>
 <message>
- <location line="+31"/>
 <source>Saving as set of jpegs</source>
- <translation>Gemmer som sæt af JPEG&apos;er</translation>
+ <translation type="vanished">Gemmer som sæt af JPEG&apos;er</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation>Kan ikke dekode billede</translation>
+ <translation type="vanished">Kan ikke dekode billede</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation>Afbryder.</translation>
+ <translation type="vanished">Afbryder.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+97"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation>Færdig</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation>Gemte %d billeder.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -2190,12 +2297,11 @@
 <translation>Fejl</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation>Kunne ikke gemme alle billeder.</translation>
+ <translation type="vanished">Kunne ikke gemme alle billeder.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation>BMP op mislykkedes</translation>
 </message>
@@ -2205,7 +2311,7 @@
 <translation>Kunne ikke gemme %s som en BMP-fil.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation>Filen %s blev gemt.</translation>
 </message>
@@ -2465,7 +2571,7 @@
 <translation>Mikser</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-274"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-278"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Dekod video ved brug af DXVA2 (windows)</translation>
 </message>
@@ -2485,12 +2591,17 @@
 <translation>Dekod video ved brug af LIBVA (INTEL)</translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+4"/>
 <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="+5"/>
+ <location line="+4"/>
 <source>_Revert to saved default output settings on video load</source>
 <translation>_Tilbagefør til gemte standardoutputindstillinger når video indlæses</translation>
 </message>
@@ -2500,7 +2611,12 @@
 <translation>_Søg efter ny udgivelse</translation>
 </message>
 <message>
- <location line="+70"/>
+ <location line="+57"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
 <source>DXVA2 (best)</source>
 <translation>DXVA2 (bedste)</translation>
 </message>
@@ -2546,12 +2662,13 @@
 <translation>Visning</translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation>Hardwareacceleration</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation>_Spørg altid hvilken port der skal bruges</translation>
 </message>
@@ -2561,7 +2678,7 @@
 <translation>Standardport som skal bruges</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-79"/>
 <source>Redo</source>
 <translation>Omgør</translation>
 </message>
@@ -2586,8 +2703,8 @@
 <translation>Indlæs gemte indstillinger</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation>Du kan ikke fjerne *hele* videoen
@@ -2632,7 +2749,7 @@
 <translation>Kan ikke vælge MPEG-4 SP-codec.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation>Vælg script/projekt som skal køre</translation>
 </message>
@@ -2647,7 +2764,7 @@
 <translation>Vælg script som skal fejlfindes</translation>
 </message>
 <message>
- <location line="+179"/>
+ <location line="+183"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Vælg videofil...</translation>
@@ -2668,7 +2785,8 @@
 <translation>Vælg videofil som skal føjes til slutning...</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+216"/>
+ <location line="+21"/>
 <source>Cutting</source>
 <translation>Klipper</translation>
 </message>
@@ -2678,7 +2796,7 @@
 <translation>Fejl under udklipning.</translation>
 </message>
 <message>
- <location line="+399"/>
+ <location line="+440"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2717,7 +2835,7 @@
 <translation>Indstilling af sproget til det givne sporindeks er ikke muligt: ugyldigt sporindeks!</translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation>Ups</translation>
 </message>
@@ -2727,12 +2845,12 @@
 <translation>Denne funktion er deaktiveret eller er ikke længere gyldig</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation>Problem ved initialisering af lydenhed</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-367"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>No</source>
 <translation>Nej</translation>
 </message>
@@ -2752,7 +2870,7 @@
 <translation>Kan ikke kontakte database. Har du Job-kontrol kørende?</translation>
 </message>
 <message>
- <location line="+219"/>
+ <location line="+225"/>
 <source>Function not implemented
 </source>
 <translation>Funktion ikke implementeret
@@ -2769,7 +2887,42 @@
 <translation>Gemning fejlede</translation>
 </message>
 <message>
- <location line="+125"/>
+ <location line="+84"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation>Kan ikke få tinyPÿ-script-motor</translation>
 </message>
@@ -2969,29 +3122,33 @@
 <translation>Ukendt codec</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation>Bygger tidskort</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation>Hukommelsesfejl</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation>Gemmer</translation>
 </message>
 <message>
- <location line="+142"/>
+ <location line="+165"/>
+ <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 line="+6"/>
 <source>Too short</source>
 <translation>For kort</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>The video has been saved but seems to be incomplete.</source>
- <translation>Videoen er blevet gemt men ser ikke ud til at være komplet.</translation>
+ <translation type="vanished">Videoen er blevet gemt men ser ikke ud til at være komplet.</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
@@ -3092,7 +3249,7 @@
 <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -3114,6 +3271,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation>Tilladelsesfejl</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation>Kan ikke åbne script &quot;%s&quot;.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation>Filfejl</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation>Script &quot;%s&quot; eksisterer ikke.</translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -3491,16 +3692,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation>_Starttid (ms):</translation>
+ <source>_Start time:</source>
+ <translation>_Starttid:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>_Sluttid (ms):</translation>
+ <source>_End time:</source>
+ <translation>Sl_uttid:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation>Erstat med sort</translation>
 </message>
@@ -3602,7 +3803,7 @@
 <translation>59,93 (NTSC)</translation>
 </message>
 <message>
- <location line="+162"/>
+ <location line="+174"/>
 <source>Source Fps:</source>
 <translation>Kilde billeder/sekund:</translation>
 </message>
@@ -3632,7 +3833,7 @@
 <translation>Ugyldig billeder/sekund</translation>
 </message>
 <message>
- <location line="-150"/>
+ <location line="-161"/>
 <source>Change FPS</source>
 <translation>Skift billeder/sekund</translation>
 </message>
@@ -3642,7 +3843,7 @@
 <translation>Gør videoen hurtigere/langsommere som ved ændring af billeder/sekund. Dette filtre ændrer varighed.</translation>
 </message>
 <message>
- <location line="+149"/>
+ <location line="+160"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
@@ -3811,13 +4012,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation>Kontrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation>Lysstyrke</translation>
 </message>
@@ -3929,7 +4130,7 @@
 <translation>Beskæringsfilter</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation>Advarsel! Klipper for meget bredde! Bredde nulstillet!
@@ -3942,6 +4143,11 @@
 <translation>Advarsel! Klipper for meget højde! Højde nulstillet!
 </translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -3953,40 +4159,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation>Højre:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation>Øverst:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation>Nulstil</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation>Nederst:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation>Venstre:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation>Automatisk beskæring</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -4189,54 +4405,42 @@
 <translation>Kodning...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation>Fase:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
 <translation>Video-codec:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation>Ingen</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation>Ukendt</translation>
 </message>
 <message>
 <location line="+14"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Beholder:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>Container:</source>
+ <translation>Beholder:</translation>
 </message>
 <message>
- <location line="-24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Lyd-codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-21"/>
+ <source>Audio Codec:</source>
+ <translation>Lyd-codec:</translation>
 </message>
 <message>
- <location line="+165"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+141"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation>0</translation>
 </message>
@@ -4246,118 +4450,64 @@
 <translation>00:00:00</translation>
 </message>
 <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Forløbet:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location line="-412"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Resterende tid:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location line="+436"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Billeder/sekund:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-7"/>
+ <source>Elapsed:</source>
+ <translation>Forløbet:</translation>
+ </message>
+ <message>
+ <location line="-379"/>
+ <source>Time Remaining:</source>
+ <translation>Resterende tid:</translation>
+ </message>
+ <message>
+ <location line="+400"/>
+ <source>Frames/sec:</source>
+ <translation>Billeder/sekund:</translation>
 </message>
 <message>
- <location line="-166"/>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation>0 MB</translation>
 </message>
 <message>
- <location line="-34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total størrelse:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Lydstørrelse:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-28"/>
+ <source>Total Size:</source>
+ <translation>Total størrelse:</translation>
 </message>
 <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Videostørrelse:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-7"/>
+ <source>Audio Size:</source>
+ <translation>Lydstørrelse:</translation>
 </message>
 <message>
- <location line="+67"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Behandlet billeder:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+28"/>
+ <source>Video Size:</source>
+ <translation>Videostørrelse:</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="+61"/>
+ <source>Processed Frames:</source>
+ <translation>Behandlet billeder:</translation>
+ </message>
+ <message>
+ <location line="+14"/>
 <source>0 kB/s</source>
 <translation>0 kB/s</translation>
 </message>
 <message>
- <location line="-40"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Gennemsnitlig bith.:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-31"/>
+ <source>Average Bitrate:</source>
+ <translation>Gennemsnitlig bith.:</translation>
 </message>
 <message>
- <location line="+30"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+24"/>
+ <source>Quantiser:</source>
+ <translation>Quantiser:</translation>
 </message>
 <message>
- <location line="-347"/>
+ <location line="-320"/>
 <source>Shut down computer when finished</source>
 <translation>Luk computer når fuldført</translation>
 </message>
@@ -4397,12 +4547,12 @@
 <translation>Pause/afbryd</translation>
 </message>
 <message>
- <location line="-158"/>
+ <location line="-149"/>
 <source>Main</source>
 <translation>Hoved</translation>
 </message>
 <message>
- <location line="+138"/>
+ <location line="+129"/>
 <source>Minimize to Tray</source>
 <translation>Minimer til bakke</translation>
 </message>
@@ -4425,7 +4575,7 @@
 <translation>Justér kontrast, lysstyrke, mætning og gamma.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4491,46 +4641,51 @@
 <source>Faac Configuration</source>
 <translation>Faac-konfiguration</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation>Overgang</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation>Overgang.</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation>_Starttid (ms):</translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation>_Starttid:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>_Sluttid (ms):</translation>
+ <source>_End time:</source>
+ <translation>Sl_uttid:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation>Overgang til sort</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation>Overgang til sort ind/ud.</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation>Ud</translation>
 </message>
@@ -4550,19 +4705,19 @@
 <translation>Overgang ind</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation>_Overgangstype:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation>_Starttid (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Starttid:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>_Sluttid (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">Sl_uttid</translation>
 </message>
 </context>
 <context>
@@ -5077,8 +5232,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation>Lav kvalitet</translation>
@@ -5119,6 +5274,21 @@
 <translation>Lav latency (HQ)</translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -5127,6 +5297,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -5140,7 +5315,27 @@
 <translation>Maks. bithastighed (kbps):</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5288,6 +5483,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -6033,8 +6286,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation>brug QT4-version</translation>
+ <source>use Qt version</source>
+ <translation>brug Qt-version</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -6371,6 +6624,11 @@
 <source>Select Logo Image</source>
 <translation>Vælg logobillede</translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -6401,19 +6659,23 @@
 <translation>Y</translation>
 </message>
 <message>
- <location line="+20"/>
 <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
- <translation>Alfa vil blive ignoreret, hvis billedet har alfa-kanaler (PNG i RGB)</translation>
+ <translation type="vanished">Alfa vil blive ignoreret, hvis billedet har alfa-kanaler (PNG i RGB)</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+20"/>
 <source>Alpha</source>
 <translation>Alfa</translation>
 </message>
 <message>
+ <location line="+20"/>
+ <source>Fade-in/out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
- <translation>Du kan klikke i billedet for at sætte logoet approximatively</translation>
+ <source>You can click in the image to approximately position the logo</source>
+ <translation>Du kan klikke på billedet for at placere logoet</translation>
 </message>
 </context>
 <context>
@@ -6605,12 +6867,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation>Gemmer MKV</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation>Gennemtving visningsbredde</translation>
 </message>
@@ -6620,7 +6882,12 @@
 <translation>Visningsbredde</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation>MKV-muxer</translation>
 </message>
@@ -6711,7 +6978,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>Problem ved læsning af SVQ3-hoveder</translation>
 </message>
@@ -6723,7 +6990,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation>Understøttes ikke</translation>
@@ -6739,7 +7006,7 @@
 <translation>Understøtter kun AAC, AC3, E-AC3 og mpegaudio til lyd</translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation>Gemmer MP4</translation>
 </message>
@@ -6749,7 +7016,7 @@
 <translation>Gemmer PSP</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation>Muxing-format</translation>
 </message>
@@ -6759,6 +7026,16 @@
 <translation>Brug alternativt MP3-tag</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation>MP4-muxer</translation>
@@ -6942,12 +7219,12 @@
 <translation>Kan ikke gå til det forrige nøglebillede</translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation>Søg</translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
@@ -7010,7 +7287,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation>Forkert udformet hoved</translation>
 </message>
@@ -7023,14 +7300,14 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
- <translation>Starttid (ms):</translation>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
+ <translation>_Starttid:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
- <translation>Sluttid (ms):</translation>
+ <source>_End time:</source>
+ <translation>Sl_uttid:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7162,7 +7439,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
@@ -7192,18 +7469,18 @@
 <translation>Vælg lydfil</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation>Fejl</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation>Kan ikke bruge den fil som lydspor</translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation>Nogle spor er brugt flere gange</translation>
 </message>
@@ -7228,7 +7505,7 @@
 <translation>.... tilføj lydspor</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation>kopiér</translation>
 </message>
@@ -7248,7 +7525,7 @@
 <translation>Root-rettigheder kræves for at udføre denne handling.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7306,7 +7583,7 @@
 <translation>&lt;b&gt;Ny version tilgængelig&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Udgivet den %2.&lt;br&gt;Du kan downloade den her&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Du kan deaktivere automatisk opdatering i præferencer.&lt;/small&gt;</translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation>Seneste filer</translation>
 </message>
@@ -7316,7 +7593,7 @@
 <translation>Seneste projekter</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation>Afspil/stop</translation>
 </message>
@@ -7381,7 +7658,7 @@
 <translation>Fremad ét minut</translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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
@@ -7393,7 +7670,7 @@
 <translation>%c-%s (%02d)</translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation> (%d spor)</translation>
 </message>
@@ -7541,7 +7818,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation>Delvist</translation>
 </message>
@@ -7581,7 +7858,7 @@
 <translation>Gør delvist</translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation>Indlæs videofiltre..</translation>
 </message>
@@ -7617,7 +7894,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation>Nej</translation>
 </message>
@@ -7633,12 +7910,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation>%02d:%02d:%02d,%03d</translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7714,7 +7991,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation>%s (%u:%u)</translation>
 </message>
@@ -7877,7 +8154,7 @@
 <translation>59,93 (NTSC)</translation>
 </message>
 <message>
- <location line="+310"/>
+ <location line="+313"/>
 <source>_Mode:</source>
 <translation>_Tilstand:</translation>
 </message>
@@ -7892,7 +8169,7 @@
 <translation>Gensample billeder/sekund</translation>
 </message>
 <message>
- <location line="-282"/>
+ <location line="-285"/>
 <source>Resample FPS</source>
 <translation>Gensample billeder/sekund</translation>
 </message>
@@ -7915,7 +8192,7 @@
 <translation>sw skalering tilpas størrelse.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation>Bredde og højde kan ikke være ulige</translation>
 </message>
@@ -7968,7 +8245,6 @@
 <translation>Lås højde-bredde-forhold</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -7985,8 +8261,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -8011,8 +8285,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8037,8 +8309,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8062,7 +8332,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -8076,7 +8345,23 @@
 <translation>Destination:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -8420,6 +8705,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>swapuv</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
@@ -8586,6 +8895,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -8600,16 +8927,16 @@
 Slet venligst idx2-filen og genåbn.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation>Der er flere med filer fortløbende filnavne. Skal de indlæses allesammen?</translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation>Indekserer</translation>
@@ -8631,7 +8958,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation>X11</translation>
 </message>
@@ -8680,6 +9007,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -8713,24 +9061,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -8983,7 +9313,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation>intet</translation>
 </message>
@@ -9029,7 +9359,7 @@
 <translation>Gennemsnitlig bithastighed:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -9047,7 +9377,7 @@
 Ønsker du at fortsætte?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -9444,8 +9774,8 @@
 </message>
 <message>
 <location line="+20"/>
- <source>10 (Best)</source>
- <translation>10 (bedste)</translation>
+ <source>11 (Best)</source>
+ <translation>11 (bedste)</translation>
 </message>
 <message>
 <location line="+78"/>
@@ -10337,7 +10667,7 @@
 <translation>Brugerdefineret</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation>Ønsket bithastighed:</translation>
 </message>
@@ -10469,12 +10799,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation>Slet</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation>Generelt</translation>
 </message>
@@ -10654,12 +10984,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation>51 (lav kvalitet)</translation>
@@ -10696,12 +11026,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation>billeder</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10999,7 +11329,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -3441,7 +3441,7 @@
 <translation type="obsolete">Es bezieht sich vielleicht auf eine alte Index-Datei.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation>Der Versuch, %s zu öffnen, ist fehlgeschlagen!</translation>
 </message>
@@ -3532,19 +3532,61 @@
 <translation>Kann Demuxer für %s nicht finden</translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation>Breite</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation>%sHöhe</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation> und </translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation> des ersten und dieses Videos unterscheide%s sich</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation>n</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation>t</translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
- <translation type="unfinished"></translation>
+ <translation>Unterschiedliche Auflösungen können nicht vermischt werden. Spätere abschnittsweise Anwendung eines Videofilters wird das Problem nicht beheben. Abhilfe:
+1) Mit &quot;Größe ändern&quot; / &quot;Rand hinzufügen&quot; / &quot;Zuschneiden&quot; die Auflösung aller Videos angleichen.
+2) Die so bearbeiteten Videos zusammenfügen.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
- <translation type="unfinished"></translation>
+ <translation>Prüfe Gültigkeit der Zeitstempel...</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation>Dekodiere Video...</translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -5094,7 +5136,7 @@
 <translation type="obsolete">&lt;b&gt;Video-Spur&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Kopieren</translation>
@@ -5140,7 +5182,7 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -5157,7 +5199,7 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation type="unfinished">Zeit:</translation>
 </message>
@@ -5166,7 +5208,7 @@
 <translation type="obsolete">Bildtyp:</translation>
 </message>
 <message>
- <location line="+82"/>
+ <location line="+83"/>
 <source>?</source>
 <translation type="unfinished">?</translation>
 </message>
@@ -5175,7 +5217,7 @@
 <translation type="obsolete">Auswahlbereich</translation>
 </message>
 <message>
- <location line="-1276"/>
+ <location line="-1279"/>
 <source>&amp;Help</source>
 <translation type="unfinished">&amp;Hilfe</translation>
 </message>
@@ -5236,7 +5278,7 @@
 <translation type="obsolete">V&amp;orlagen</translation>
 </message>
 <message>
- <location line="+1545"/>
+ <location line="+1544"/>
 <source>&amp;Open...</source>
 <translation type="unfinished">&amp;Öffnen...</translation>
 </message>
@@ -5354,7 +5396,7 @@
 <translation type="obsolete">Als JPG-Bild speichern</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished">&amp;Lade/Starte Projekt...</translation>
 </message>
@@ -5534,12 +5576,12 @@
 <translation type="obsolete">ein Bild zu&amp;rück</translation>
 </message>
 <message>
- <location line="-1034"/>
+ <location line="-1043"/>
 <source>ms</source>
 <translation type="unfinished">ms</translation>
 </message>
 <message>
- <location line="+763"/>
+ <location line="+764"/>
 <source>A:</source>
 <translation type="unfinished">A:</translation>
 </message>
@@ -5753,7 +5795,7 @@
 <translation type="obsolete">Schriftzeichen bearbeiten</translation>
 </message>
 <message>
- <location line="+279"/>
+ <location line="+287"/>
 <source>&amp;Input</source>
 <translation type="unfinished">&amp;Original</translation>
 </message>
@@ -5773,12 +5815,12 @@
 <translation type="unfinished">&amp;übereinander</translation>
 </message>
 <message>
- <location line="-516"/>
+ <location line="-524"/>
 <source>Frame type:</source>
 <translation>Frame-Typ:</translation>
 </message>
 <message>
- <location line="+504"/>
+ <location line="+512"/>
 <source>&amp;Separate</source>
 <translation type="unfinished">&amp;eigenständig</translation>
 </message>
@@ -5803,7 +5845,7 @@
 <translation type="obsolete">Video CD</translation>
 </message>
 <message>
- <location line="-1748"/>
+ <location line="-1759"/>
 <source>&amp;Toolbars</source>
 <translation type="unfinished">&amp;Werkzeugleisten</translation>
 </message>
@@ -5822,12 +5864,12 @@
 <translation type="obsolete">Codec-Einstellungen</translation>
 </message>
 <message>
- <location line="+216"/>
+ <location line="+218"/>
 <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
 <translation type="unfinished">&lt;b&gt;Video-Codec&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished">&lt;b&gt;Audio-Codec&lt;/b&gt;</translation>
 </message>
@@ -5837,7 +5879,7 @@
 <translation type="unfinished"> (0 Tonspur(en))</translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+212"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
 <translation type="unfinished">&lt;b&gt;Ausgabeformat&lt;/b&gt;</translation>
 </message>
@@ -5850,7 +5892,7 @@
 <translation type="obsolete">Pegelanzeige</translation>
 </message>
 <message>
- <location line="+1037"/>
+ <location line="+1046"/>
 <source>&amp;Codec Options</source>
 <translation type="unfinished">&amp;Codec-Einstellungen</translation>
 </message>
@@ -5874,17 +5916,17 @@
 <translation type="obsolete">Filter bei Wiedergabe anwenden</translation>
 </message>
 <message>
- <location line="-321"/>
+ <location line="-136"/>
 <source>Play filtered</source>
 <translation type="unfinished">Filter anwenden</translation>
 </message>
 <message>
- <location line="+158"/>
+ <location line="-39"/>
 <source>Open Video</source>
 <translation type="unfinished">Videodatei öffnen</translation>
 </message>
 <message>
- <location line="-741"/>
+ <location line="-738"/>
 <source>Play [SPACE]</source>
 <translation>Wiedergabe/Stopp [Leertaste]</translation>
 </message>
@@ -5949,7 +5991,7 @@
 <translation>Eine Minute vor [Strg + Pfeiltaste hoch]</translation>
 </message>
 <message>
- <location line="+268"/>
+ <location line="+269"/>
 <source>Go to marker A [PAGE UP]</source>
 <translation>Springe zur Markierung A [Bild hoch]</translation>
 </message>
@@ -5959,12 +6001,11 @@
 <translation>Springe zur Markierung B [Bild runter]</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>Display output video on playback</source>
- <translation>Bei der Wiedergabe das Ergebnis nach Anwendung der Filter zeigen</translation>
+ <translation type="vanished">Bei der Wiedergabe das Ergebnis nach Anwendung der Filter zeigen</translation>
 </message>
 <message>
- <location line="-1316"/>
+ <location line="-1307"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5981,12 +6022,12 @@
 </message>
 <message>
 <location line="+553"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-859"/>
+ <location line="-868"/>
 <source>Play</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5996,7 +6037,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+77"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -6017,7 +6058,12 @@
 <translation type="unfinished">000000</translation>
 </message>
 <message>
- <location line="+42"/>
+ <location line="+13"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
 <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6027,7 +6073,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+154"/>
+ <location line="+166"/>
 <source>Ctrl+Alt+C</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6437,6 +6483,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -6651,6 +6705,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -7150,12 +7209,7 @@
 <translation type="unfinished">Eine plattformunabhängige Videoschnittsoftware</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+84"/>
+ <location line="+94"/>
 <source>OK</source>
 <translation type="unfinished">OK</translation>
 </message>
@@ -7165,7 +7219,12 @@
 <translation type="unfinished">http://www.avidemux.org</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="-19"/>
+ <source>© 2001 - 2018 Mean</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+64"/>
 <source>&amp;License</source>
 <translation type="unfinished">&amp;Lizenz</translation>
 </message>
@@ -7178,7 +7237,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>_Linker Rand:</translation>
 </message>
@@ -7253,14 +7312,13 @@
 <translation type="obsolete">_Während des Kodierens ein Symbol im Infobereich statt in der Taskleiste anzeigen.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+227"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+231"/>
 <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>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">AVI-Dateien im _OpenDML-Format erstellen (AVI 2.0), um Dateien größer als 4 GB speichern zu können</translation>
+ <translation type="obsolete">AVI-Dateien im _OpenDML-Format erstellen (AVI 2.0), um Dateien größer als 4 GB speichern zu können</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7373,16 +7431,21 @@
 <translation type="unfinished">Priorisierung bestimmter Aufgaben</translation>
 </message>
 <message>
- <location line="+7"/>
+ <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>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation>_Den Ordner der gerade geladenen Datei als Speicherziel vorschlagen</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation>Im Kopiermodus _Gleichmäßigkeit der Zeitstempel für Dekodierung (DTS) erhöhen</translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (bestens)</translation>
@@ -7488,10 +7551,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Audio</translation>
 </message>
@@ -7505,7 +7568,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">Prozessor</translation>
 </message>
@@ -7525,7 +7588,7 @@
 <translation>Standardport</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
 <source>Pr&amp;eferences</source>
 <translation>&amp;Einstellungen</translation>
 </message>
@@ -7535,7 +7598,7 @@
 <translation>Einstellungen</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
 <source>Open</source>
 <translation>Ö&amp;ffnen...</translation>
 </message>
@@ -7551,7 +7614,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+125"/>
+ <location filename="../../common/gui_save.cpp" line="+282"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished">Zur &amp;Warteschlange hinzufügen...</translation>
@@ -7568,11 +7631,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished">Als JPEG-Bild speichern</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>Schlie&amp;ßen</translation>
 </message>
@@ -7670,12 +7743,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>&amp;Filter</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished">Filter &amp;anwenden</translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>&amp;Tonspur wählen</translation>
 </message>
@@ -7920,12 +7998,12 @@
 <translation type="unfinished">Audiogeräte</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-284"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
 <source>Enable openGl support</source>
 <translation>OpenG_L benutzen</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+237"/>
 <source>_Limit Refresh Rate</source>
 <translation>_Bildwiederholungsfrequenz begrenzen</translation>
 </message>
@@ -7935,29 +8013,28 @@
 <translation>Bild _neu aufbauen nicht häufiger als nach (ms)</translation>
 </message>
 <message>
- <location line="-191"/>
+ <location line="-189"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
 <source>High</source>
 <translation>Hoch</translation>
 </message>
 <message>
- <location line="-55"/>
+ <location line="-56"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Video mittels _DXVA2 dekodieren (nur Windows)</translation>
 </message>
 <message>
- <location line="+59"/>
+ <location line="+60"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
 <source>Low</source>
 <translation>Niedrig</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>_Split MPEG files every (MB):</source>
- <translation type="unfinished">MPEG-Dateien splitten nach (in MiB):</translation>
+ <translation type="obsolete">MPEG-Dateien splitten nach (in MiB):</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+21"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished">VDPAU (bestens)</translation>
 </message>
@@ -7995,7 +8072,7 @@
 <translation>Codec-Fehler</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation>Nicht implementiert in dieser Version</translation>
 </message>
@@ -8008,12 +8085,41 @@
 <translation type="obsolete">AVI-Datei auswählen zum Anhängen...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Sind Sie sicher?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">Rechtefehler</translation>
 </message>
@@ -8118,7 +8224,7 @@
 <translation type="unfinished">Haupt-Tonspur</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">Avs-Proxy</translation>
 </message>
@@ -8150,7 +8256,7 @@
 <translation type="unfinished">hexadezimales Abbild des Bildes</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+34"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
 <source>Go to Time</source>
 <translation type="unfinished">Gehe zur Zeit</translation>
 </message>
@@ -8160,7 +8266,7 @@
 <translation type="unfinished">_U mit V tauschen (YUV-Farbmodell)</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-357"/>
+ <location filename="../../common/gui_save.cpp" line="-520"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Arbeitsbereich als Projekt speichern</translation>
 </message>
@@ -8185,7 +8291,7 @@
 <translation>JPEG-Datei zum Speichern wählen</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation>Datei zum Speichern wählen</translation>
 </message>
@@ -8195,39 +8301,36 @@
 <translation type="unfinished">Audio speichern</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Speichern als Satz von Jpeg-Dateien</translation>
+ <translation type="obsolete">Speichern als Satz von Jpeg-Dateien</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">Das Bild kann nicht dekodiert werden</translation>
+ <translation type="obsolete">Das Bild kann nicht dekodiert werden</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">Abbruch.</translation>
+ <translation type="obsolete">Abbruch.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Fertig</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">%d Bilder gespeichert.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -8238,12 +8341,11 @@
 <translation>Fehler</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">Nicht alle Bilder konnten gespeichert werden.</translation>
+ <translation type="obsolete">Nicht alle Bilder konnten gespeichert werden.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP Operation fehlgeschlagen</translation>
 </message>
@@ -8253,7 +8355,7 @@
 <translation>Das Speichern von %s als BMP-Datei ist fehlgeschlagen.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">Die Datei %s wurde erfolgreich gespeichert.</translation>
 </message>
@@ -8474,7 +8576,7 @@
 <translation type="obsolete">Dieses Script wurde bereits erfolgreich abgearbeitet.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-172"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Video mittels _VDPAU dekodieren</translation>
 </message>
@@ -8489,12 +8591,17 @@
 <translation>Video mittels _LibVA dekodieren (Intel)</translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation>Video mittels _VideoToolbox dekodieren (macOS)</translation>
+ </message>
+ <message>
 <location line="+4"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
- <translation type="unfinished">Bei Dekodierung in Hardware verwende den entsprechenden Videoausgabe_treiber</translation>
+ <translation>Bei aktivierter Dekodierung in Hardware ist es ratsam, die entsprechende Video-Anzeige zu verwenden</translation>
 </message>
 <message>
- <location line="+88"/>
+ <location line="+85"/>
 <source>LIBVA (best)</source>
 <translation type="unfinished">libVA (bestens)</translation>
 </message>
@@ -8509,12 +8616,12 @@
 <translation>Systemvorgabe</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-169"/>
 <source>_Check for new release</source>
 <translation>Auf _Update überprüfen</translation>
 </message>
 <message>
- <location line="+232"/>
+ <location line="+230"/>
 <source>GUI Rendering Options</source>
 <translation>Darstellungsoptionen der grafischen Oberfläche</translation>
 </message>
@@ -8524,20 +8631,21 @@
 <translation>Darstellung</translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished">HW-Beschleunigung</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation>Das *ganze* Video zu löschen ist nicht möglich
 </translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1030"/>
+ <location filename="../../common/gui_main.cpp" line="-1102"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Videodatei wählen...</translation>
@@ -8548,18 +8656,23 @@
 <translation>Videodatei zum Anfügen wählen...</translation>
 </message>
 <message>
- <location line="+869"/>
+ <location line="+941"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation>Speichern</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1154"/>
+ <location line="+165"/>
+ <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="-1230"/>
 <source>Select script/project to run</source>
 <translation>Skript/Projekt zum Ausführen wählen</translation>
 </message>
@@ -8579,7 +8692,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="+133"/>
+ <location line="+137"/>
 <source>No engine</source>
 <translation>Keine Skript-Engine</translation>
 </message>
@@ -8589,7 +8702,15 @@
 <translation>tinyPy wurde beim Kompilieren nicht aktiviert</translation>
 </message>
 <message>
- <location line="+252"/>
+ <location line="+160"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation>Schneiden</translation>
 </message>
@@ -8599,7 +8720,7 @@
 <translation>Fehler beim Ausschneiden.</translation>
 </message>
 <message>
- <location line="+690"/>
+ <location line="+731"/>
 <source>Cannot use that file as audio track</source>
 <translation>Kann diese Datei nicht als Tonspur verwenden</translation>
 </message>
@@ -8776,26 +8897,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-143"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
 <location line="+3"/>
 <source>Sdl driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+15"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-101"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-102"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
 <translation type="unfinished">-</translation>
 </message>
 <message>
- <location line="+59"/>
+ <location line="+60"/>
 <source>Build Option</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8898,18 +9019,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1206"/>
+ <location filename="../../common/gui_main.cpp" line="-1282"/>
 <source>Select script to save</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+995"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location line="+1071"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+501"/>
+ <location line="+504"/>
 <source>Oops</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8919,12 +9040,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Probleme beim Initialisieren des Audio-Gerätes</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-367"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>No</source>
 <translation type="unfinished">Nein</translation>
 </message>
@@ -8959,7 +9080,12 @@
 <translation type="unfinished">Job zur Warteschlange hinzufügen</translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -8975,17 +9101,51 @@
 <translation type="unfinished">Das Speichern ist fehlgeschlagen</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished">JPEG</translation>
 </message>
 <message>
 <location line="+0"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>Fail to save as jpeg</source>
- <translation type="unfinished">Speichern als JPEG fehlgeschlagen</translation>
+ <translation type="obsolete">Speichern als JPEG fehlgeschlagen</translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9380,24 +9540,23 @@
 <translation type="unfinished">Unbekannter Codec</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Speicherfehler</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation>Video zu kurz</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished">Das gespeicherte Video scheint unvollständig zu sein.</translation>
+ <translation type="obsolete">Das gespeicherte Video scheint unvollständig zu sein.</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
@@ -9498,7 +9657,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -9527,6 +9686,54 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation>Zeitstempelkonflikt (DTS) festgestellt, das betroffene Keyframe bei %s wird übersprungen.
+Dies wird zu schweren Bildstörungen im gespeicherten Video führen.
+Trotzdem fortsetzen?</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation>Zeitstempelkonflikt (DTS) festgestellt, das betroffene Frame bei %s wird übersprungen.
+Dies kann zu Bildstörungen im gespeicherten Video führen.
+Trotzdem fortsetzen?</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation>Nicht mehr über übersprungene Frames beim Speichern dieses Videos warnen?</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation>Einige Frames vor %s mussten verzögert werden, was zum vorübergehenden Verlust der Bild-Ton-Synchronität führte. Trotzdem fortsetzen?</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation>Berechtigungsfehler</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation>Skript &quot;%s&quot; kann nicht geöffnet werden.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation>Dateifehler</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation>Skript &quot;%s&quot; existiert nicht.</translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -9916,21 +10123,21 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation>_Beginn:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation>_Ende:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation>Durch Schwarz ersetzen</translation>
 </message>
 <message>
- <location line="-16"/>
+ <location line="-17"/>
 <source>Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10026,7 +10233,7 @@
 <context>
 <name>changeFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+76"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+77"/>
 <source>Change FPS</source>
 <translation>Bildfrequenz ändern</translation>
 </message>
@@ -10036,7 +10243,7 @@
 <translation>Beschleunige oder verlangsame Video durch Änderung der Bildfrequenz. Dieser Filter beeinflusst die Abspieldauer.</translation>
 </message>
 <message>
- <location line="-37"/>
+ <location line="-38"/>
 <source>Custom</source>
 <translation>Benutzerdefiniert</translation>
 </message>
@@ -10066,7 +10273,7 @@
 <translation>59,93 (NTSC)</translation>
 </message>
 <message>
- <location line="+162"/>
+ <location line="+174"/>
 <source>Source Fps:</source>
 <translation>Ausgangsbildfrequenz:</translation>
 </message>
@@ -10265,13 +10472,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation>Kontrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation>Helligkeit</translation>
 </message>
@@ -10383,7 +10590,7 @@
 <translation>Bildrand entfernen.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation>Die Breite kann nicht im geforderten Maße verkleinert werden. Die Breite wird zurückgesetzt!
@@ -10396,6 +10603,11 @@
 <translation>Die Höhe kann nicht im geforderten Maße verkleinert werden. Die Höhe wird zurückgesetzt!
 </translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -10407,40 +10619,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished">Rechts:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished">Oben:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished">Originalzustand</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished">Unten:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished">Links:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished">Zuschneideautomatik</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -10669,90 +10891,42 @@
 <translation type="unfinished">Kodieren...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
- <translation type="unfinished">Vorgang:</translation>
+ <translation>Vorgang:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
- <translation type="unfinished">Video Codec:</translation>
+ <translation>Video-Codec:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Keine</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Unbekannt</translation>
 </message>
 <message>
- <source>Container:</source>
- <translation type="obsolete">Container:</translation>
- </message>
- <message>
- <source>Audio Codec:</source>
- <translation type="obsolete">Audio Codec:</translation>
- </message>
- <message>
- <source>Elapsed:</source>
- <translation type="obsolete">vergangene Zeit:</translation>
- </message>
- <message>
- <source>Time Remaining:</source>
- <translation type="obsolete">verbleibende Zeit:</translation>
- </message>
- <message>
- <source>Frames/sec:</source>
- <translation type="obsolete">Bilder je Sekunde:</translation>
- </message>
- <message>
- <location line="+84"/>
+ <location line="+69"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 MB</translation>
 </message>
 <message>
- <source>Total Size:</source>
- <translation type="obsolete">Größe gesamt:</translation>
- </message>
- <message>
- <source>Audio Size:</source>
- <translation type="obsolete">Größe Audiospur:</translation>
- </message>
- <message>
- <source>Video Size:</source>
- <translation type="obsolete">Größe Videospur:</translation>
- </message>
- <message>
- <source>Processed Frames:</source>
- <translation type="obsolete">bearbeitete Bilder:</translation>
- </message>
- <message>
- <source>Total Frames:</source>
- <translation type="obsolete">Bilder gesamt:</translation>
- </message>
- <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 kb/s</translation>
 </message>
 <message>
- <source>Average Bitrate:</source>
- <translation type="obsolete">durchschnittliche Bitrate:</translation>
- </message>
- <message>
- <source>Quantiser:</source>
- <translation type="obsolete">Quantisierung:</translation>
- </message>
- <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation>Nach Beendigung den Computer herunterfahren</translation>
 </message>
@@ -10789,7 +10963,7 @@
 <message>
 <location line="+45"/>
 <source>Pause / Abort</source>
- <translation type="unfinished">Pause / Abbruch</translation>
+ <translation>Pause / Abbruch</translation>
 </message>
 <message>
 <location line="+13"/>
@@ -10797,138 +10971,81 @@
 <translation>Details</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation>Allgemein</translation>
 </message>
 <message>
- <location line="+48"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Verbleibende Zeit:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+42"/>
+ <source>Time Remaining:</source>
+ <translation>Verbleibende Zeit:</translation>
 </message>
 <message>
- <location line="+90"/>
+ <location line="+87"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <source>Audio Codec:</source>
+ <translation type="unfinished">Audio-Codec:</translation>
 </message>
 <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Container:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Größe Audio:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation>Größe Audio:</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Gesamtgröße:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation>Gesamtgröße:</translation>
 </message>
 <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Größe Video:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation>Größe Video:</translation>
 </message>
 <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Durchschnittliche Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation>Mittlere Bitrate:</translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
 <message>
- <location line="-78"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Bilder verarbeitet:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation>Bilder verarbeitet:</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+7"/>
+ <source>Quantiser:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Zeit vergangen:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation>Zeit vergangen:</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
 <location line="+14"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Bilder pro Sekunde:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>Frames/sec:</source>
+ <translation>Bilder pro Sekunde:</translation>
 </message>
 </context>
 <context>
@@ -10975,7 +11092,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11061,6 +11178,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -11104,41 +11226,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished">Ausblenden</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished">Zum Ende dieses Filters hin auf das Bild am Beginn überblenden.</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished">_Beginn:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished">_Ende:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished">Zu Schwarz überblenden</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished">Einblenden von Schwarz aus / Ausblenden zu Schwarz.</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Ausblenden</translation>
 </message>
@@ -11158,19 +11280,19 @@
 <translation>Einblenden</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">Überb_lenden:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation>_Beginn:</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Beginn:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>_Ende:</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Ende:</translation>
 </message>
 </context>
 <context>
@@ -11685,8 +11807,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -11727,6 +11849,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -11735,6 +11872,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -11748,7 +11890,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation>NVENC H.264 Konfiguration</translation>
 </message>
@@ -11888,6 +12050,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -12688,7 +12908,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -13196,6 +13416,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished">Bild als Logo auswählen</translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -13211,12 +13436,17 @@
 <translation>Wählen...</translation>
 </message>
 <message>
- <location line="+131"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="+83"/>
+ <source>Fade-in/out</source>
+ <translation>Übergang</translation>
+ </message>
+ <message>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation>In die Vorschau klicken, um die Position der linken oberen Ecke des Logos festzulegen</translation>
 </message>
 <message>
- <location line="-155"/>
+ <location line="-172"/>
 <source>Logo</source>
 <translation type="unfinished">Logo</translation>
 </message>
@@ -13232,11 +13462,6 @@
 </message>
 <message>
 <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
 <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13537,12 +13762,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Speichere MKV</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation>Anzeigebreite erzwingen</translation>
 </message>
@@ -13552,7 +13777,12 @@
 <translation>Anzeigebreite</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13643,7 +13873,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Problem beim Lesen der SVQ3 Kopfzeilen</translation>
 </message>
@@ -13655,7 +13885,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation>Nicht unterstütztes Format</translation>
@@ -13675,7 +13905,7 @@
 <translation type="obsolete">Für Audio ist nur AAC, AC3, MP2 und MP3 zulässig</translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13685,7 +13915,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13695,6 +13925,16 @@
 <translation type="unfinished">Alternativen Tag für MP3 benutzen</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -13897,12 +14137,12 @@
 <translation>Kann nicht zum vorhergehenden Keyframe wechseln</translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished">Navigation</translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Fehler</translation>
 </message>
@@ -13999,7 +14239,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Fehlerhafte Kopfzeilen</translation>
 </message>
@@ -14012,19 +14252,19 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
- <translation type="unfinished">Anfangszeit:</translation>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Beginn:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
- <translation type="unfinished">Ende:</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Ende:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Configure filter</source>
- <translation type="unfinished">Konfigurieren</translation>
+ <translation type="unfinished">_Konfigurieren</translation>
 </message>
 <message>
 <location line="+3"/>
@@ -14256,7 +14496,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Fehler</translation>
 </message>
@@ -14285,18 +14525,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Fehler</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished">Kann diese Datei nicht als Tonspur verwenden</translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14321,7 +14561,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14341,7 +14581,7 @@
 <translation type="unfinished">Für diese Operation sind Root-Rechte erforderlich.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14394,7 +14634,7 @@
 <context>
 <name>qgui2</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+441"/>
+ <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+456"/>
 <source>Recent Files</source>
 <translation>Zuletzt verwendete &amp;Dateien</translation>
 </message>
@@ -14404,7 +14644,7 @@
 <translation>Zuletzt verwendete &amp;Projekte</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14469,17 +14709,17 @@
 <translation>Eine Minute vor</translation>
 </message>
 <message>
- <location line="+1182"/>
+ <location line="+1213"/>
 <source> (%d track(s))</source>
 <translation> (%d Tonspur(en))</translation>
 </message>
 <message>
- <location line="-2091"/>
+ <location line="-2156"/>
 <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="+1514"/>
+ <location line="+1560"/>
 <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.
@@ -14634,7 +14874,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Abschnittsweise Anwendung</translation>
 </message>
@@ -14674,7 +14914,7 @@
 <translation>Abschnittsweise anwenden</translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14710,7 +14950,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">Nein</translation>
 </message>
@@ -14730,7 +14970,7 @@
 <translation type="unfinished">Stereo</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14806,18 +15046,18 @@
 <translation>Kein Ton</translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation>%02d:%02d:%02d,%03d</translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14944,7 +15184,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Modus:</translation>
 </message>
@@ -14959,7 +15199,7 @@
 <translation type="unfinished">Bildfrequenz (Hz) ändern</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation>Benutzerdefiniert</translation>
 </message>
@@ -15002,7 +15242,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Breite und Höhe können nicht ungerade sein</translation>
 </message>
@@ -15062,10 +15302,14 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
 <source>Lock Aspect Ratio</source>
- <translation type="unfinished">Seitenverhältnis beibehalten</translation>
+ <translation>Seitenverhältnis sperren</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished">PAR der Quelle:</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -15077,13 +15321,11 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
 <source>Source:</source>
- <translation type="unfinished">Quelle:</translation>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -15108,8 +15350,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -15134,8 +15374,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -15159,7 +15397,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -15170,10 +15407,21 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-18"/>
 <source>Destination:</source>
- <translation type="unfinished">Ziel:</translation>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished">PAR des Ziels:</translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -15582,6 +15830,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation>Standbild</translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation>Ein Frame für angegebene Zeit wiederholen.</translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Beginn:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished">_Dauer:</translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -15779,6 +16051,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -15793,16 +16083,16 @@
 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="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation>Es gibt mehrere Dateien mit fortlaufender Nummerierung im Dateinamen. Sollen sie alle geladen werden?</translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Indizierung</translation>
@@ -15824,7 +16114,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15873,6 +16163,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -15906,24 +16217,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -16277,7 +16570,7 @@
 <translation type="unfinished">Dieser Modus ist nicht implementiert</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation>Kein Tuning</translation>
 </message>
@@ -16323,7 +16616,7 @@
 <translation type="unfinished">Durchschnittliche Bitrate:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -16341,7 +16634,7 @@
 Möchten Sie fortfahren?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -16586,16 +16879,12 @@
 <message>
 <location line="+42"/>
 <source>1 (Fast)</source>
- <translation type="unfinished">1 (Schnell)</translation>
+ <translation type="unfinished">1 (schnell)</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Subpixel Refinement</source>
- <translation type="unfinished">viertelpixelgenaue Suchverfeinerung [subme]</translation>
- </message>
- <message>
- <source>9 (Best)</source>
- <translation type="obsolete">9 (am Besten)</translation>
+ <translation type="unfinished"> Viertelpixelgenaue Suchverfeinerung [subme] </translation>
 </message>
 <message>
 <location line="+98"/>
@@ -17016,8 +17305,8 @@
 </message>
 <message>
 <location line="+411"/>
- <source>10 (Best)</source>
- <translation type="unfinished">9 (am Besten) {10 ?}</translation>
+ <source>11 (Best)</source>
+ <translation type="unfinished">11 (am besten)</translation>
 </message>
 <message>
 <location line="+436"/>
@@ -17827,7 +18116,7 @@
 <translation>Benutzerdefiniert</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Ziel-Bitrate:</translation>
 </message>
@@ -17959,12 +18248,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">Löschen</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished">Allgemein</translation>
 </message>
@@ -18144,12 +18433,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished">Quantisierung</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished">51 (niedrige Qualität)</translation>
@@ -18186,12 +18475,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished">Bilder (I-Bilder: max. GOP beachten)</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished">Sequence Parameter Set Identifer [sps-id]:</translation>
 </message>
@@ -18489,7 +18778,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_el.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_el.ts Changed

@@ -2755,7 +2755,7 @@
 <translation type="obsolete">Ίσως να συνδέεται με ένα παλαιότερο αρχείο ευρετηρίου.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation>Η προσπάθεια ανοίγματος του %s απέτυχε.</translation>
 </message>
@@ -2795,7 +2795,37 @@
 <translation>Αδυναμία εύρεσης αποπολυπλέκτη για το %s</translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
@@ -2804,12 +2834,22 @@
 Και μετά, ένωση των βίντεων.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation>Ελέγχεται η εγκυρότητα των χρονοσφραγίδων</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -3870,7 +3910,7 @@
 <translation type="obsolete">&lt;b&gt;Βίντεο&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation>Αντιγραφή</translation>
@@ -3916,7 +3956,7 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation>...</translation>
 </message>
@@ -3933,12 +3973,12 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation>Χρόνος:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation>00:00:00.000</translation>
 </message>
@@ -3967,7 +4007,7 @@
 <translation>000000</translation>
 </message>
 <message>
- <location line="-1414"/>
+ <location line="-1417"/>
 <source>&amp;Help</source>
 <translation>Βοή&amp;θεια</translation>
 </message>
@@ -4028,7 +4068,7 @@
 <translation type="obsolete">Αυ&amp;τόματο</translation>
 </message>
 <message>
- <location line="+1545"/>
+ <location line="+1544"/>
 <source>&amp;Open...</source>
 <translation>Άν&amp;οιγμα...</translation>
 </message>
@@ -4134,7 +4174,7 @@
 <translation type="obsolete">Αποθήκευση Εικόνας JPEG</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation>&amp;Φόρτωση ή Τρέξιμο Εργασίας...</translation>
 </message>
@@ -4315,12 +4355,12 @@
 <translation type="obsolete">Προη&amp;γούμενο Καρέ</translation>
 </message>
 <message>
- <location line="-1034"/>
+ <location line="-1043"/>
 <source>ms</source>
 <translation>χιλ.τουδευτ.</translation>
 </message>
 <message>
- <location line="+763"/>
+ <location line="+764"/>
 <source>A:</source>
 <translation>A:</translation>
 </message>
@@ -4572,7 +4612,7 @@
 <translation type="obsolete">Επεξεργασία των Ανάγλυφων</translation>
 </message>
 <message>
- <location line="+279"/>
+ <location line="+287"/>
 <source>&amp;Input</source>
 <translation>Δεδομένα Ε&amp;ισόδου</translation>
 </message>
@@ -4592,17 +4632,17 @@
 <translation>&amp;Κορυφή</translation>
 </message>
 <message>
- <location line="-1641"/>
+ <location line="-1650"/>
 <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1125"/>
+ <location line="+1126"/>
 <source>Frame type:</source>
 <translation>Τύπος στιγμιότυπου:</translation>
 </message>
 <message>
- <location line="+504"/>
+ <location line="+512"/>
 <source>&amp;Separate</source>
 <translation>Δια&amp;χωρισμός</translation>
 </message>
@@ -4627,7 +4667,7 @@
 <translation type="obsolete">Video CD</translation>
 </message>
 <message>
- <location line="-1748"/>
+ <location line="-1759"/>
 <source>&amp;Toolbars</source>
 <translation>&amp;Γραμμές εργαλείων</translation>
 </message>
@@ -4642,7 +4682,7 @@
 <translation>Π&amp;ρόσφατο</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation>Ε&amp;πιλογές Κώδικα</translation>
 </message>
@@ -4662,7 +4702,7 @@
 <translation>&lt;b&gt;Έξοδος Βίντεου&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation>&lt;b&gt;Έξοδος Ήχου&lt;/b&gt;</translation>
 </message>
@@ -4672,18 +4712,18 @@
 <translation> (0 κανάλι(-α))</translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+212"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
 <translation>&lt;b&gt;Μορφή Εξόδου&lt;/b&gt;</translation>
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation>&amp;Πλοήγηση</translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation>Αναπαραγωγή [ΔΙΑΣΤΗΜΑ]</translation>
 </message>
@@ -4762,7 +4802,7 @@
 <translation>Μπροστά κατά ένα λεπτό</translation>
 </message>
 <message>
- <location line="+178"/>
+ <location line="+179"/>
 <source>Se&amp;lection</source>
 <translation>Επι&amp;λογή</translation>
 </message>
@@ -4777,22 +4817,26 @@
 <translation>Μετάβαση στο Δείκτη Β΄ [PAGE DOWN]</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>Display output video on playback</source>
- <translation>Προβολή του βίντεου εξαγωγής κατά την αναπαραγωγή</translation>
+ <translation type="vanished">Προβολή του βίντεου εξαγωγής κατά την αναπαραγωγή</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation>Αναπαραγωγή του μεταμορφωμένου</translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation>Έντασ&amp;η</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation>Ήχος και &amp;Μετρητής</translation>
 </message>
@@ -4802,7 +4846,7 @@
 <translation>Άνοιγμα Βίντεου</translation>
 </message>
 <message>
- <location line="+107"/>
+ <location line="+119"/>
 <source>&amp;Codec Options</source>
 <translation>Επιλογές &amp;Κώδικα</translation>
 </message>
@@ -5104,6 +5148,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -5250,6 +5302,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation>...</translation>
 </message>
@@ -5318,12 +5375,7 @@
 <translation>Σχετικά με το Avidemux</translation>
 </message>
 <message>
- <location line="+122"/>
- <source>© 2001 - 2017 Mean</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+19"/>
+ <location line="+141"/>
 <source>http://www.avidemux.org</source>
 <translation>http://www.avidemux.org</translation>
 </message>
@@ -5338,11 +5390,16 @@
 <translation>Πολλαπλών Πλατφορμών Επεξεργαστής Βίντεων</translation>
 </message>
 <message>
+ <location line="+10"/>
+ <source>© 2001 - 2018 Mean</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>© 2001 - 2016 Mean</source>
 <translation type="vanished">© 2001 - 2016 Μυιν (Mean)</translation>
 </message>
 <message>
- <location line="+74"/>
+ <location line="+64"/>
 <source>&amp;License</source>
 <translation>&amp;Άδεια</translation>
 </message>
@@ -5355,7 +5412,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>_Αριστερό όριο:</translation>
 </message>
@@ -5426,17 +5483,16 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Αποκωδικοποίηση του βίντεου με τη χρήση DXVA2 (windows)</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>Create _OpenDML files</source>
- <translation>Δημι_ουργία αρχείων OpenDML</translation>
+ <translation type="vanished">Δημι_ουργία αρχείων OpenDML</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+13"/>
 <source>_Revert to saved default output settings on video load</source>
 <translation>_Επαναφορά στις προεπιλεγμένες ρυθμίσεις εξόδου του βίντεου, κατά τη φόρτωση του αρχείου</translation>
 </message>
@@ -5558,11 +5614,16 @@
 <translation>Ορισμός Προτεραιοτήτων</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+6"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation>XVideo (καλύτερο)</translation>
@@ -5604,7 +5665,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -5674,10 +5735,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation>Ήχος</translation>
 </message>
@@ -5691,7 +5752,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation>Κεντρικός Επεξεργαστής</translation>
 </message>
@@ -5701,7 +5762,7 @@
 <translation>Προτιμήσεις</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+42"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -5729,7 +5790,7 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>Μεταμορφωτές</translation>
 </message>
@@ -5917,7 +5978,7 @@
 <translation>Σφάλμα Κώδικα</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation>Δεν κωδικοποιήθηκε σε αυτή την έκδοση</translation>
 </message>
@@ -5930,12 +5991,41 @@
 <translation type="obsolete">Επιλέξτε ένα αρχείο AVI για προσκόλληση...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation>Στα σίγουρα;</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation>Σφάλμα δικαιωμάτων</translation>
 </message>
@@ -6032,7 +6122,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation>Κάτι στραβό έγινε</translation>
 </message>
@@ -6047,7 +6137,7 @@
 <translation>Κύριο Κανάλι Ήχου</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation>AvsProxy</translation>
 </message>
@@ -6075,7 +6165,7 @@
 <translation>Μέγεθος στιγμιότυπου:</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+34"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
 <source>Go to Time</source>
 <translation>Μετάβαση στο Χρόνο</translation>
 </message>
@@ -6090,7 +6180,7 @@
 <translation>_Εναλλαγή U και V</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation>Επέλεξε Workbench για Αποθήκευση</translation>
 </message>
@@ -6115,7 +6205,7 @@
 <translation>Επέλεξε JPEG για Αποθήκευση</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation>Επέλεξε Αρχείο για να Φορτωθεί</translation>
 </message>
@@ -6125,39 +6215,36 @@
 <translation>Αποθηκεύεται ο ήχος</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation>Αποθήκευση ως μια ομάδα από jpeg</translation>
+ <translation type="vanished">Αποθήκευση ως μια ομάδα από jpeg</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation>Αδυναμία αποκωδικοποίησης του στιγμιότυπου</translation>
+ <translation type="vanished">Αδυναμία αποκωδικοποίησης του στιγμιότυπου</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation>Εγκατάλειψη.</translation>
+ <translation type="vanished">Εγκατάλειψη.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation>Έγινε</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation>Αποθηκεύτηκαν %d εικόνες.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-242"/>
+ <location filename="../../common/gui_main.cpp" line="-245"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -6168,12 +6255,11 @@
 <translation>Σφάλμα</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation>Αδυναμία αποθήκευσης όλων των εικόνων.</translation>
+ <translation type="vanished">Αδυναμία αποθήκευσης όλων των εικόνων.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation>Απέτυχε η BMP λειτουργία</translation>
 </message>
@@ -6183,7 +6269,7 @@
 <translation>Απέτυχε η αποθήκευση του %s ως αρχείο BMP.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation>Το αρχείο %s αποθηκεύτηκε με επιτυχία.</translation>
 </message>
@@ -6345,11 +6431,16 @@
 <translation>Κέρδος</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation>Αποθηκεύεται</translation>
 </message>
 <message>
+ <location line="+165"/>
+ <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/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
 <source>DRC</source>
 <translation>DRC</translation>
@@ -6476,7 +6567,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+10"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-118"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-123"/>
 <source>_Horizontal deblocking</source>
 <translation>Ορι_ζόντια αφαίρεση τμημάτων</translation>
 </message>
@@ -6492,7 +6583,7 @@
 <translation>Αφαίρεση _δακτυλίων</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-169"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Αποκωδικοποίηση του βίντεου με τη χρήση VDPAU (NVIDIA)</translation>
 </message>
@@ -6507,12 +6598,17 @@
 <translation>Αποκωδικοποίηση του βίντεου με τη χρήση LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Enable openGl support</source>
 <translation>Ενεργοποίηση της υποστήριξης openGl</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>Αν χρησιμοποιήσεις αποκωδικοποίηση υλικού, να επιλέξεις και τον ταιριαστό οδηγό συσκευής απεικόνισης</translation>
 </message>
@@ -6526,17 +6622,16 @@
 <translation>_Αποδοχή μη τυποποιημένων συχνοτήτων ήχου για DVD</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+4"/>
 <source>_Check for new release</source>
 <translation>Έλεγ_χος για νέα έκδοση</translation>
 </message>
 <message>
- <location line="+55"/>
 <source>_Split MPEG files every (MB):</source>
- <translation>_Χωρισμός αρχείων MPEG ανά (ΜέγαΜπάιτια):</translation>
+ <translation type="vanished">_Χωρισμός αρχείων MPEG ανά (ΜέγαΜπάιτια):</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+55"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation>_Χρήση εναλλακτικής ετικέτας για MP3 μέσα σε .mp4</translation>
 </message>
@@ -6597,12 +6692,13 @@
 <translation>Προβολή</translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation>Επιτάχυνση Υλικού</translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Threading</source>
 <translation>Γνέσιμο</translation>
 </message>
@@ -6617,7 +6713,7 @@
 <translation>Προεπιλεγμένη θύρα για χρήση</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
 <source>Open</source>
 <translation>Άνοιγμα</translation>
 </message>
@@ -6650,11 +6746,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation>Αποθήκευση ως JPEG</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>Κλείσιμο</translation>
 </message>
@@ -6736,7 +6842,12 @@
 <translation>ΜετΕπεξεργασία</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>Επέλεξε Κανάλι</translation>
 </message>
@@ -6841,8 +6952,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation>Δεν μπορείς να αφαιρέσεις *όλο* το βίντεο</translation>
@@ -6925,7 +7036,7 @@
 Είναι απαραίτητο για τη δημιουργία βίντεου συμβατό με PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation>Επέλεξε σενάριο ή εργασία για τρέξιμο</translation>
 </message>
@@ -6950,7 +7061,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation>Επιλέξτε Αρχείο Βίντεου...</translation>
@@ -6971,7 +7082,15 @@
 <translation>Επιλέξτε Αρχείο Βίντεου για Προσκόλληση...</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation>Αποκόβει</translation>
 </message>
@@ -6981,7 +7100,7 @@
 <translation>Σφάλμα κατά την αποκοπή.</translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation>Δόθηκε μη έγκυρο ευρετήριο ήχου</translation>
@@ -7012,7 +7131,7 @@
 <translation>Ο ορισμός της γλώσσας για τα περιεχόμενα του δοσμένου καναλιού δεν είναι εφικτός: Μη έγκυρα περιεχόμενα καναλιού.</translation>
 </message>
 <message>
- <location line="+180"/>
+ <location line="+183"/>
 <source>Frame Hex Dump</source>
 <translation>Εξαγωνική Απόρριψη Καρέ</translation>
 </message>
@@ -7027,12 +7146,12 @@
 <translation>Αυτή η λειτουργία είναι απενεργοποιημένη και δεν ισχύει πια</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation>Πρόβλημα στην αρχικοποίηση της συσκευής ήχου</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation>Όχι</translation>
 </message>
@@ -7067,7 +7186,12 @@
 <translation>Προσθήκη της διαδικασίας στη σειρά του ΚατάστιχουΔιαδικασιών</translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation>Η λειτουργία δεν έχει υλοποιηθεί</translation>
@@ -7083,17 +7207,51 @@
 <translation>Η αποθήκευση απέτυχε</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
 <location line="+0"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>Fail to save as jpeg</source>
- <translation>Αδυναμία αποθήκευσης ως jpeg</translation>
+ <translation type="vanished">Αδυναμία αποθήκευσης ως jpeg</translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation>Αδυναμία λήψης της μηχανής σεναρίων tinyPÿ</translation>
 </message>
@@ -7523,24 +7681,23 @@
 <translation>Άγνωστος κώδικας</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation>Χτίσιμο χάρτη χρόνου</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation>Σφάλμα μνήμης</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation>Πολύ σύντομο</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>The video has been saved but seems to be incomplete.</source>
- <translation>Το βίντεο έχει παυθεί, αλλά φαίνεται να είναι ασύμβατο.</translation>
+ <translation type="vanished">Το βίντεο έχει παυθεί, αλλά φαίνεται να είναι ασύμβατο.</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
@@ -7640,7 +7797,7 @@
 <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -7669,6 +7826,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -8052,16 +8253,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation>_Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
+ <source>_Start time:</source>
+ <translation>_Χρόνος έναρξης:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>_Χρόνος λήξης (χιλ.τουδευτ..):</translation>
+ <source>_End time:</source>
+ <translation>Χ_ρόνος λήξης:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation>Αντικατάσταση με Μαύρο</translation>
 </message>
@@ -8230,7 +8431,7 @@
 <translation>59.93 (NTSC)</translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation>Αλλαγή ΣτιγΑνάΔευτ</translation>
 </message>
@@ -8242,7 +8443,7 @@
 Αυτός ο μεταμορφωτής αλλάζει τη διάρκεια.</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation>Στιγ.ΑνάΔευτ. Πηγής:</translation>
 </message>
@@ -8436,7 +8637,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation>Αντίθεση</translation>
 </message>
@@ -8446,8 +8647,8 @@
 <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας και των χρωμάτων.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8575,7 +8776,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation>Προειδοποίηση! : Υπερβολικά μεγάλη περιτομή κατά πλάτος. Έγινε επαναφορά του πλάτους.</translation>
@@ -8586,6 +8787,11 @@
 </source>
 <translation>Προειδοποίηση! : Υπερβολικά μεγάλη περιτομή κατά ύψος. Έγινε επαναφορά του ύψους.</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -8597,40 +8803,50 @@
 </message>
 <message>
 <location line="+88"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+88"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
 <source>Reset</source>
 <translation>Επαναφορά</translation>
 </message>
 <message>
 <location line="-50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-50"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Right:</source>
 <translation>Δεξιά:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation>Κορυφή:</translation>
 </message>
 <message>
 <location line="+64"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Bottom:</source>
 <translation>Κάτω:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation>Αριστερά:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation>Αυτόματη Περιτομή</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -8856,48 +9072,103 @@
 </message>
 <message>
 <location line="+44"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation>Κανένα</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation>Άγνωστο</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation>0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation>00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation>0 ΜέγαΜπάιτια</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation>0 χιλιομπίτια/δευτ</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation>Κλείσιμο του υπολογιστή, όταν τελειώσει</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation>Προτεραιότητα:</translation>
 </message>
@@ -8937,142 +9208,131 @@
 <translation>Προχωρημένα</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation>Κύριο</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+35"/>
 <source>Phase:</source>
 <translation>Φάση:</translation>
 </message>
 <message>
- <location line="+7"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Απομένων Χρόνος:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+90"/>
+ <location line="+94"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+86"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Κώδικας Ήχου:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+24"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Σκεύος:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+16"/>
+ <location line="+114"/>
 <source>Video Codec:</source>
 <translation>Κώδικας Βίντεου:</translation>
 </message>
 <message>
- <location line="+34"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Μέγεθος Ήχου:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Συνολικό Μέγεθος:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+24"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Μέγεθος Βίντεου:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+47"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Μέσος Ρυθμός Μπιτιών:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+20"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Επεξεργασμένα Στιγμιότυπα:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Κβαντιστής:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+51"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Πέρασε:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+24"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Στιγμιότυπα/δευτ.:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -9118,7 +9378,7 @@
 <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας, της πληρότητας και του γάμμα.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9192,6 +9452,11 @@
 <source>Faac Configuration</source>
 <translation>Ρύθμιση Faac</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -9235,41 +9500,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation>Ομαλή μετάβαση</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation>Ομαλή μετάβαση.</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation>_Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation>_Χρόνος λήξης (χιλ.τουδευτ..):</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation>Φθίνουσα μετάβαση στο μαύρο</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation>Φθίνουσα μετάβαση στο μαύρο, είσοδος/έξοδος.</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation>Έξοδος</translation>
 </message>
@@ -9289,19 +9554,19 @@
 <translation>Αύξουσα είσοδος</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation>_Τύπος μετάβασης:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation>_Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>_Χρόνος λήξης (χιλ.τουδευτ..):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Χρόνος λήξης (χιλ.τουδευτ..):</translation>
 </message>
 </context>
 <context>
@@ -9816,8 +10081,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation>Χαμηλής Ποιότητας</translation>
@@ -9858,6 +10123,21 @@
 <translation>Χαμηλή Καθυστέρηση (Υψ.Ποι.)</translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -9866,6 +10146,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -9879,7 +10164,27 @@
 <translation>Μέγιστος Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10020,6 +10325,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -10815,8 +11178,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation>χρήση έκδοσης QT4</translation>
+ <source>use Qt version</source>
+ <translation>χρήση έκδοσης Qt</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -11289,6 +11652,11 @@
 <source>Select Logo Image</source>
 <translation>Επιλογή Εικόνας Λογότυπου</translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -11319,19 +11687,27 @@
 <translation>Y</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
- <translation>Το Άλφα (διαφάνεια) θα αγνοείται, αν η εικόνα έχει κανάλι άλφα (png σε RGB)</translation>
+ <translation type="vanished">Το Άλφα (διαφάνεια) θα αγνοείται, αν η εικόνα έχει κανάλι άλφα (png σε RGB)</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-85"/>
 <source>Alpha</source>
 <translation>Άλφα</translation>
 </message>
 <message>
- <location line="+65"/>
 <source>You can click in the image to set the logo approximatively</source>
- <translation>Μπορείς να κλικάρεις στην εικόνα για να ορίσεις το λογότυπο στο περίπου</translation>
+ <translation type="vanished">Μπορείς να κλικάρεις στην εικόνα για να ορίσεις το λογότυπο στο περίπου</translation>
 </message>
 </context>
 <context>
@@ -11578,12 +11954,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation>Αποθηκεύεται το Mkv</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation>Εξαναγκασμός του πλάτους της προβολής</translation>
 </message>
@@ -11593,7 +11969,12 @@
 <translation>Εμφάνιση πλάτους</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation>Πολυπλέκτης MKV</translation>
 </message>
@@ -11684,7 +12065,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>Πρόβλημα στην ανάγνωση των κεφαλίδων SVQ3</translation>
 </message>
@@ -11696,7 +12077,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation>Μη υποστηριζόμενη</translation>
@@ -11716,7 +12097,7 @@
 <translation type="vanished">Μόνο AAC, AC3, κ΄ mpegaudio υποστηρίζονται για ήχο</translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation>Αποθηκεύεται το mp4</translation>
 </message>
@@ -11726,7 +12107,7 @@
 <translation>Αποθηκεύεται το PSP</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation>Μορφή Πολυπλεξίματος</translation>
 </message>
@@ -11736,6 +12117,16 @@
 <translation>Χρήση εναλλακτικών καρτελών MP3</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation>Πολυπλέκτης MP4</translation>
@@ -11939,12 +12330,12 @@
 <translation>Αδυναμία μετάβασης στο προηγούμενο κλειδοστιγμιότυπο</translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation>Αναζήτηση</translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation>Σφάλμα</translation>
 </message>
@@ -12041,7 +12432,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation>Παραμορφωμένη κεφαλίδα</translation>
 </message>
@@ -12054,13 +12445,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation>Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation>Χρόνος Λήξης (χιλ.τουδευτ.):</translation>
 </message>
 <message>
@@ -12231,7 +12622,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation>Σφάλμα</translation>
 </message>
@@ -12261,18 +12652,18 @@
 <translation>Επέλεξε αρχείο ήχου</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation>Σφάλμα</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation>Αδυναμία χρήσης αυτού του αρχείου σαν κανάλι ήχου</translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation>Κάποια κανάλια χρησιμοποιούνται πολλαπλές φορές</translation>
 </message>
@@ -12297,7 +12688,7 @@
 <translation>.... Προσθήκη καναλιού Ήχου</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation>αντιγραφή</translation>
 </message>
@@ -12317,7 +12708,7 @@
 <translation>Απαιτούνται δικαιώματα Υπερχρήστη για να εκτελεστεί αυτή η λειτουργία.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12375,7 +12766,7 @@
 <translation>&lt;b&gt;Διαθέσιμη νέα έκδοση&lt;/b&gt;&lt;br&gt; Έκδοση %1&lt;br&gt;Εκδόθηκε στις %2.&lt;br&gt;Μπορείς να το κατεβάσεις από εδώ&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Μπορείς να απενεργοποιήσεις την αυτόματη ενημέρωση στις προτιμήσεις.&lt;/small&gt;</translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation>Πρόσφατα Αρχεία</translation>
 </message>
@@ -12385,7 +12776,7 @@
 <translation>Πρόσφατες Εργασίες</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12450,7 +12841,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
 <translation>Η εφαρμογή αντιμετώπισε ένα μοιραίο πρόβλημα
@@ -12462,7 +12853,7 @@
 <translation>%c-%s (%02d)</translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation> (%d κανάλι(-α))</translation>
 </message>
@@ -12610,7 +13001,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation>Μερικό</translation>
 </message>
@@ -12650,7 +13041,7 @@
 <translation>Να γίνει μερικό</translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation>Φόρτωση μεταμορφωτών βίντεου...</translation>
 </message>
@@ -12686,7 +13077,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation>Όχι</translation>
 </message>
@@ -12706,7 +13097,7 @@
 <translation>Στερεοφωνικός</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12782,18 +13173,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation>%2.3f στιγ.ανάδευτ.</translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation>%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation>%s (%u:%u)</translation>
 </message>
@@ -12914,7 +13305,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation>_Κατάσταση Λειτουργίας:</translation>
 </message>
@@ -12929,7 +13320,7 @@
 <translation>Επαναδειγματοληψία στιγ.ανάδευτ.</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation>Προσαρμοσμένο</translation>
 </message>
@@ -12972,7 +13363,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation>Το πλάτος και το ύψος δεν μπορούν να είναι μονοί αριθμοί</translation>
 </message>
@@ -13005,8 +13396,6 @@
 <translation>Αλλαγή διαστάσεων</translation>
 </message>
 <message>
- <location line="+50"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
@@ -13033,8 +13422,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -13059,8 +13446,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -13083,7 +13468,7 @@
 <translation>16:9</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
@@ -13143,7 +13528,7 @@
 <translation>Δικυβικός</translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -13173,7 +13558,6 @@
 <translation>Κλείδωμα της Αναλογίας Διαστάσεων</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -13189,7 +13573,6 @@
 </message>
 <message>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+42"/>
@@ -13203,7 +13586,23 @@
 <translation>Προορισμός:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -13525,6 +13924,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -13718,6 +14141,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -13732,16 +14173,16 @@
 Παρακαλώ, διέγραψε το αρχείο idx2, και κάνε ξανά άνοιγμα.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation>Υπάρχουν αρκετά αρχεία με συνεχόμενες ονομασίες. Να φορτωθούν όλα μαζί;</translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation>Δημιουργία ευρετηρίου</translation>
@@ -13763,7 +14204,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation>X11</translation>
 </message>
@@ -13812,6 +14253,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -13845,24 +14307,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -14175,7 +14619,7 @@
 <translation>αυτή η κατάσταση λειτουργίας δεν έχει υλοποιηθεί</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation>κανένα</translation>
 </message>
@@ -14221,7 +14665,7 @@
 <translation>Μέσος Ρυθμός Μπιτιών:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -14241,7 +14685,7 @@
 Θες να συνεχίσεις;</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -14501,7 +14945,12 @@
 <translation>31</translation>
 </message>
 <message>
- <location line="+1916"/>
+ <location line="+171"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1745"/>
 <source>Normal</source>
 <translation>Κανονικό</translation>
 </message>
@@ -14732,12 +15181,11 @@
 <translation>Λαγάρισμα Υπο-εικονοστοιχείου</translation>
 </message>
 <message>
- <location line="+20"/>
 <source>10 (Best)</source>
- <translation>10 (Καλύτερο)</translation>
+ <translation type="vanished">10 (Καλύτερο)</translation>
 </message>
 <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation>Διάνυσμα Κίνησης</translation>
 </message>
@@ -15534,7 +15982,7 @@
 <translation>Προσαρμοσμένο</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation>Ρυθμός Μπιτιών Προορισμού:</translation>
 </message>
@@ -15668,12 +16116,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation>Διαγραφή</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation>Γενικό</translation>
 </message>
@@ -15853,12 +16301,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation>Κβαντιστής</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation>51 (Χαμηλή Ποιότητα)</translation>
@@ -15895,12 +16343,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation>στιγμιότυπα</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation>Αναγνωριστικό Ομάδας Παραμέτρων Συχνότητας:</translation>
 </message>
@@ -16198,7 +16646,12 @@
 <translation>Μείωση Θορύβου Δια-στιγμιοτυπική:</translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation>Πλαίσιο Κβαντισμού</translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.7.1.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="+193"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
 <source>Cannot find a demuxer for %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14,19 +14,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -497,7 +537,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -538,7 +578,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-112"/>
+ <location line="-128"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -548,7 +588,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -564,12 +604,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -592,12 +632,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -667,7 +707,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation type="unfinished"></translation>
 </message>
@@ -718,22 +758,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -769,7 +809,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -872,6 +912,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>SpiderMonkeyShell</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
@@ -908,6 +956,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -936,7 +989,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -958,7 +1011,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1018,7 +1071,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+435"/>
+ <location filename="../../common/gui_save.cpp" line="+599"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation>Qu&amp;eue</translation>
@@ -1029,7 +1082,17 @@
 <translation>Save as I&amp;mage</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>&amp;Close</translation>
 </message>
@@ -1117,12 +1180,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>&amp;Filters</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>&amp;Select Track</translation>
 </message>
@@ -1235,7 +1303,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="+367"/>
 <source>Stereo</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1386,7 +1454,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+121"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
 <source>CPU</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1396,7 +1464,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1432,13 +1500,13 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-163"/>
+ <location filename="../../common/gui_save.cpp" line="-320"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1535,7 +1603,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1555,12 +1623,17 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1571,11 +1644,6 @@
 </message>
 <message>
 <location line="+1"/>
- <source>Create _OpenDML files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>_Revert to saved default output settings on video load</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1703,17 +1771,17 @@
 </message>
 <message>
 <location line="+5"/>
- <source>_Split MPEG files every (MB):</source>
+ <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
- <source>_Use alternative tag for MP3 in .mp4</source>
+ <location line="+1"/>
+ <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
- <source>_Default to the directory of the last read file for saving</source>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -1779,7 +1847,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1874,12 +1942,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Threading</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1899,17 +1968,17 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-104"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
 <source>Save as BMP</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -1931,7 +2000,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>&amp;Advanced</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1981,25 +2050,25 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="+1330"/>
+ <location filename="../../common/gui_main.cpp" line="+1407"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
 <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="+71"/>
+ <location filename="../../common/gui_save.cpp" line="+183"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-42"/>
- <location line="+42"/>
+ <location line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -2087,7 +2156,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2112,7 +2181,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+97"/>
+ <location line="+101"/>
 <source>Not coded in this version</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2138,22 +2207,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+159"/>
+ <location line="+114"/>
+ <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"/>
 <source>Are you sure?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+47"/>
+ <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
+ <location line="-20"/>
+ <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>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+16"/>
 <source>Error while cutting out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+72"/>
+ <location line="+8"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2248,7 +2354,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2294,7 +2400,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+138"/>
+ <location line="+141"/>
 <source>AvsProxy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2335,12 +2441,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-327"/>
+ <location filename="../../common/gui_save.cpp" line="-445"/>
 <source>No</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2400,6 +2506,11 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation type="unfinished"></translation>
@@ -2426,48 +2537,58 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
- <source>Saving as set of jpegs</source>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Cannot decode frame</source>
+ <location line="+20"/>
+ <source>Warning</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Aborting.</source>
+ <source>Maximum number of 9999 images reached, aborting.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
- <source>Done</source>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-38"/>
- <source>Saved %d images.</source>
+ <location line="+32"/>
+ <source>PNG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Could not save all images.</source>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="-34"/>
+ <location line="+83"/>
+ <source>Done</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-83"/>
+ <source>Saved %d images.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+63"/>
 <source>BMP op failed</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2477,7 +2598,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2932,28 +3053,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
- <source>Too short</source>
+ <location line="+165"/>
+ <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 line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
+ <location line="+6"/>
+ <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -3049,7 +3170,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -3077,6 +3198,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -3443,16 +3608,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3554,7 +3719,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3564,7 +3729,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3758,7 +3923,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3768,8 +3933,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3879,7 +4044,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -3890,6 +4055,11 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -3901,40 +4071,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -4143,32 +4323,29 @@
 </message>
 <message>
 <location line="+11"/>
- <location line="+223"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-206"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-194"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-200"/>
+ <location line="-194"/>
 <source>Phase:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <source>Time Remaining:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4219,111 +4396,81 @@
 </message>
 <message>
 <location line="+53"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <source>Audio Codec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Container:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+16"/>
- <source>Video Codec:</source>
+ <location line="+41"/>
+ <source>Audio Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+7"/>
+ <source>Total Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Video Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+7"/>
- <location line="+17"/>
- <source>0 MB</source>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+17"/>
+ <source>Processed Frames:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+7"/>
+ <source>Quantiser:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+37"/>
- <location line="+51"/>
- <source>0</source>
+ <location line="+48"/>
+ <source>Elapsed:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-78"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Frames/sec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="-199"/>
+ <source>Video Codec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>0 kB/s</source>
+ <location line="+48"/>
+ <location line="+7"/>
+ <location line="+14"/>
+ <source>0 MB</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+44"/>
+ <location line="+31"/>
+ <location line="+48"/>
+ <source>0</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>00:00:00</source>
+ <location line="-55"/>
+ <source>0 kB/s</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+48"/>
+ <source>00:00:00</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -4340,7 +4487,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4406,46 +4553,51 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4465,18 +4617,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -4992,8 +5144,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -5034,6 +5186,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -5042,6 +5209,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -5055,7 +5227,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5195,6 +5387,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -5937,7 +6187,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -6275,6 +6525,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -6305,18 +6560,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -6509,12 +6764,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6524,7 +6779,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6603,7 +6863,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6611,7 +6871,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished"></translation>
@@ -6627,7 +6887,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6637,7 +6897,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6647,6 +6907,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -6829,12 +7099,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6897,7 +7167,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6910,13 +7180,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7049,7 +7319,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7078,18 +7348,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7114,7 +7384,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7134,7 +7404,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7192,7 +7462,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7202,7 +7472,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7267,7 +7537,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -7278,7 +7548,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7426,7 +7696,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7466,7 +7736,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7502,7 +7772,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7518,12 +7788,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7599,7 +7869,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7769,7 +8039,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+274"/>
+ <location line="+277"/>
 <source>_Mode:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7787,7 +8057,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <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>
 </message>
@@ -7850,7 +8120,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -7867,8 +8136,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -7893,8 +8160,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -7919,8 +8184,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -7944,7 +8207,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -7958,7 +8220,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -8298,6 +8576,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>swapuv</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
@@ -8464,6 +8766,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -8477,16 +8797,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished"></translation>
@@ -8508,7 +8828,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8557,6 +8877,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -8590,24 +8931,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -8857,7 +9180,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8903,7 +9226,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -8917,7 +9240,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -9313,7 +9636,7 @@
 </message>
 <message>
 <location line="+20"/>
- <source>10 (Best)</source>
+ <source>11 (Best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -10205,7 +10528,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10332,12 +10655,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">&amp;Delete</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10517,12 +10840,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -10559,12 +10882,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10862,7 +11185,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -3435,7 +3435,7 @@
 <translation type="obsolete">Puede estar relacionado a un archivo de índice antiguo.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">¡Intento de apertura de %s fallido!</translation>
 </message>
@@ -3503,19 +3503,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -4674,7 +4714,7 @@
 <translation type="obsolete">&lt;b&gt;Vídeo&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Copiar</translation>
@@ -4715,7 +4755,7 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="+647"/>
+ <location line="+648"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -4766,7 +4806,7 @@
 <translation type="obsolete">DVD</translation>
 </message>
 <message>
- <location line="-1263"/>
+ <location line="-1266"/>
 <source>&amp;Help</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4826,7 +4866,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4842,7 +4882,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4852,7 +4892,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4868,12 +4908,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4896,12 +4936,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4971,7 +5011,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+82"/>
+ <location line="+83"/>
 <source>?</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4991,22 +5031,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5042,7 +5082,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5408,6 +5448,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -5576,6 +5624,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5660,7 +5713,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -5677,7 +5730,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished">Borde inferior:</translation>
 </message>
@@ -5749,7 +5802,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5758,14 +5811,13 @@
 <translation type="obsolete">Minimizar en el tray al codificar</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">Permitir frecuencia de sonido no estándar para DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">Crear archivos _OpenDML</translation>
+ <translation type="obsolete">Crear archivos _OpenDML</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -5890,16 +5942,21 @@
 <translation type="unfinished">Priorización</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished">Usar un tag alternativo para MP3 en .mp4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (mejor)</translation>
@@ -5941,7 +5998,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -6024,10 +6081,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Audio</translation>
 </message>
@@ -6041,7 +6098,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">CPU</translation>
 </message>
@@ -6051,7 +6108,7 @@
 <translation type="unfinished">Hilos</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
 <source>Pr&amp;eferences</source>
 <translation type="unfinished">Preferencias</translation>
 </message>
@@ -6061,7 +6118,7 @@
 <translation type="unfinished">Preferencias</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
 <source>Open</source>
 <translation type="unfinished">Abrir</translation>
 </message>
@@ -6077,7 +6134,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+125"/>
+ <location filename="../../common/gui_save.cpp" line="+282"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished">Cola</translation>
@@ -6094,11 +6151,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished">Guardar como JPEG</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation type="unfinished">Cerrar</translation>
 </message>
@@ -6198,12 +6265,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">Filtros</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished">Seleccionar Pista</translation>
 </message>
@@ -6495,17 +6567,16 @@
 <translation type="unfinished">Guardar tarea</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-284"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
 <source>Enable openGl support</source>
 <translation type="unfinished">Activar soporte openGL</translation>
 </message>
 <message>
- <location line="+66"/>
 <source>_Split MPEG files every (MB):</source>
- <translation type="unfinished">_Dividir archivos MPEG cada (MB)</translation>
+ <translation type="obsolete">_Dividir archivos MPEG cada (MB)</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+74"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished">VDPAU (mejor)</translation>
 </message>
@@ -6576,12 +6647,12 @@
 Se necesita para crear video compatible PSP</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+188"/>
+ <location filename="../../common/gui_main.cpp" line="+189"/>
 <source>Select script to save</source>
 <translation type="unfinished">Seleccione script para guardar</translation>
 </message>
 <message>
- <location line="+164"/>
+ <location line="+168"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Sin codificar en esta versión</translation>
 </message>
@@ -6594,12 +6665,41 @@
 <translation type="obsolete">Seleccionar archivo AVI para anexar...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">¿Está seguro?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">Error de permisos</translation>
 </message>
@@ -6695,7 +6795,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">Ha sucedido algo inesperado</translation>
 </message>
@@ -6710,7 +6810,7 @@
 <translation type="unfinished">Pista de sonido principal</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">AvsProxy</translation>
 </message>
@@ -6742,7 +6842,7 @@
 <translation type="unfinished">Volcado Hex de la Imagen</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation type="unfinished">Marca de Tiempo:</translation>
 </message>
@@ -6768,7 +6868,7 @@
 </translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-376"/>
+ <location filename="../../common/gui_save.cpp" line="-539"/>
 <source>Output file</source>
 <translation type="unfinished">Archivo de Salida</translation>
 </message>
@@ -6808,6 +6908,11 @@
 <translation type="unfinished">Seleccionar JPEG a guardar</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation type="unfinished">Seleccionar archivo a guardar</translation>
@@ -6818,44 +6923,40 @@
 <translation type="unfinished">Guardando audio</translation>
 </message>
 <message>
- <location line="+148"/>
 <source>Fail to save as jpeg</source>
- <translation type="unfinished">Fallo al guardar como jpeg</translation>
+ <translation type="obsolete">Fallo al guardar como jpeg</translation>
 </message>
 <message>
- <location line="+31"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Guardar como conjunto de imágenes jpegs</translation>
+ <translation type="obsolete">Guardar como conjunto de imágenes jpegs</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">No se pudo decodificar imagen</translation>
+ <translation type="obsolete">No se pudo decodificar imagen</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">Cancelando.</translation>
+ <translation type="obsolete">Cancelando.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Hecho</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">%d imágenes guardadas.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -6866,12 +6967,11 @@
 <translation type="unfinished">Error</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">No se pudo guardar todas las imágenes.</translation>
+ <translation type="obsolete">No se pudo guardar todas las imágenes.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Op BMP ha fallado</translation>
 </message>
@@ -6881,7 +6981,7 @@
 <translation type="unfinished">Guardar %s como BMP ha fallado.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">El archivo %s se guardó satisfactoriamente.</translation>
 </message>
@@ -7230,11 +7330,16 @@
 <translation type="unfinished">Ganancia</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished">Guardando</translation>
 </message>
 <message>
+ <location line="+165"/>
+ <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/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
 <source>DRC</source>
 <translation type="unfinished"></translation>
@@ -7330,7 +7435,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-91"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-90"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7345,17 +7450,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+4"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+80"/>
+ <location line="+78"/>
 <source>LIBVA (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7401,12 +7511,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7416,12 +7527,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-62"/>
 <source>Save current settings as default</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Plugins</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7431,8 +7542,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -7466,7 +7577,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7486,7 +7597,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -7507,7 +7618,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7517,7 +7636,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -7548,7 +7667,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">¡Vaya!</translation>
 </message>
@@ -7558,12 +7677,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Problema al inicializar el dispositivo de sonido</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-367"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>No</source>
 <translation type="unfinished">No</translation>
 </message>
@@ -7583,7 +7702,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+219"/>
+ <location line="+225"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -7599,12 +7718,47 @@
 <translation type="unfinished">Falló el guardado</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+0"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7878,26 +8032,21 @@
 <translation type="unfinished">Codec desconocido</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Error de memoria</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
 <source>Unknown</source>
@@ -7990,7 +8139,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -8018,6 +8167,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -8388,16 +8581,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">_Comienzo (ms)</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Comienzo:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">_Final (ms)</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Final:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8541,7 +8734,7 @@
 <translation type="obsolete">Cambiar fps</translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+179"/>
 <source>Source Fps:</source>
 <translation type="unfinished">Fps origen:</translation>
 </message>
@@ -8571,7 +8764,7 @@
 <translation type="unfinished">Fps incorrecto</translation>
 </message>
 <message>
- <location line="-185"/>
+ <location line="-197"/>
 <source>25 (PAL)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8596,7 +8789,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished">Cambiar FPS</translation>
 </message>
@@ -8606,7 +8799,7 @@
 <translation type="unfinished">Acelerar/enlentecer video al alterar los fps; este filtro cambia la duración del video.</translation>
 </message>
 <message>
- <location line="+149"/>
+ <location line="+160"/>
 <source>Error</source>
 <translation type="unfinished">Error</translation>
 </message>
@@ -8786,13 +8979,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Contraste</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8912,7 +9105,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished">¡Peligro cortando demasiada anchura! ¡Anchura restablecida!</translation>
@@ -8923,6 +9116,11 @@
 </source>
 <translation type="unfinished">¡Peligro cortando demasiada altura! ¡Altura restablecida!</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -8934,40 +9132,50 @@
 </message>
 <message>
 <location line="+88"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+88"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
 <source>Reset</source>
 <translation type="unfinished">Restablecer</translation>
 </message>
 <message>
 <location line="-50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-50"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+64"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -9203,48 +9411,103 @@
 </message>
 <message>
 <location line="+44"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Ninguno</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Desconocido</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 MB</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 kB/s</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">Apagar el ordenador al terminar</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation type="unfinished">Prioridad:</translation>
 </message>
@@ -9279,118 +9542,30 @@
 <translation type="unfinished">Pausar / Cancelar</translation>
 </message>
 <message>
- <location line="-117"/>
+ <location line="-114"/>
 <source>Phase:</source>
 <translation type="unfinished">Fase:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
 <translation type="unfinished">Códec de Video:</translation>
 </message>
 <message>
- <location line="-264"/>
+ <location line="-243"/>
 <source>Main</source>
 <translation type="unfinished">Principal</translation>
 </message>
 <message>
- <location line="+171"/>
+ <location line="+162"/>
 <source>Advanced</source>
 <translation type="unfinished">Avanzado</translation>
 </message>
 <message>
- <location line="-123"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="-33"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -9432,7 +9607,7 @@
 <translation type="unfinished">Ajustar contraste, brillo, saturación y gamma.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9506,6 +9681,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -9538,11 +9718,11 @@
 <translation type="obsolete">Tipo de _Desvanecimiento:</translation>
 </message>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="obsolete">_Comienzo (ms)</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="obsolete">_Final (ms)</translation>
 </message>
 <message>
@@ -9561,41 +9741,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished">Desvanecer</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished">_Comienzo (ms)</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished">_Final (ms)</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished">Fundido a Negro</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Salida</translation>
 </message>
@@ -9615,18 +9795,18 @@
 <translation type="unfinished">Desvanecimiento ent/sal.</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished">_Comienzo (ms)</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished">_Final (ms)</translation>
 </message>
 </context>
@@ -10147,8 +10327,8 @@
 <translation type="unfinished">Configuración libavcodec MPEG-4</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -10189,6 +10369,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -10197,6 +10392,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -10210,7 +10410,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10345,6 +10565,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -11116,8 +11394,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation type="unfinished">Usar versión QT4</translation>
+ <source>use Qt version</source>
+ <translation type="unfinished">Usar versión Qt</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -11628,6 +11906,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -11658,18 +11941,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -11916,12 +12199,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Guardar MKV</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11931,7 +12214,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12018,7 +12306,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Hubo un problema leyendo cabeceras SVQ3</translation>
 </message>
@@ -12030,7 +12318,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">No soportado</translation>
@@ -12046,7 +12334,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Guardar MP4</translation>
 </message>
@@ -12056,7 +12344,7 @@
 <translation type="unfinished">Guardar PSP</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12066,6 +12354,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -12293,12 +12591,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Error</translation>
 </message>
@@ -12410,7 +12708,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Cabecera deformada</translation>
 </message>
@@ -12423,13 +12721,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -12604,7 +12902,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Error</translation>
 </message>
@@ -12633,18 +12931,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Error</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12669,7 +12967,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12689,7 +12987,7 @@
 <translation type="unfinished">Se necesitan privilegios de Superusuario para llevar a cabo esta operación.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12747,7 +13045,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished">Archivos Recientes</translation>
 </message>
@@ -12757,7 +13055,7 @@
 <translation type="unfinished">Proyectos Recientes</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12822,7 +13120,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -12833,7 +13131,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12981,7 +13279,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Parcial</translation>
 </message>
@@ -13021,7 +13319,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13057,7 +13355,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">No</translation>
 </message>
@@ -13077,7 +13375,7 @@
 <translation type="unfinished">Stereo</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13153,18 +13451,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13291,7 +13589,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Modo:</translation>
 </message>
@@ -13306,7 +13604,7 @@
 <translation type="unfinished">Cambiar fps</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation type="unfinished">Personalizar</translation>
 </message>
@@ -13354,7 +13652,7 @@
 <translation type="unfinished">Cambiar tamaño por software</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Anchura y altura no pueden tener valor impar</translation>
 </message>
@@ -13382,8 +13680,6 @@
 <translation type="unfinished">Redimensionar</translation>
 </message>
 <message>
- <location line="+50"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
@@ -13410,8 +13706,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -13436,8 +13730,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -13460,7 +13752,7 @@
 <translation type="unfinished">16:9</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
@@ -13520,7 +13812,7 @@
 <translation type="unfinished">Bicúbico</translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -13550,7 +13842,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -13566,7 +13857,6 @@
 </message>
 <message>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+42"/>
@@ -13580,7 +13870,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -13925,6 +14231,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -14131,6 +14461,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -14144,16 +14492,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Indexando</translation>
@@ -14175,7 +14523,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished">X11</translation>
 </message>
@@ -14224,6 +14572,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -14257,24 +14626,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpauVideoFilterDeint</name>
 <message>
 <source>Keep Top Field</source>
@@ -14706,7 +15057,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14752,7 +15103,7 @@
 <translation type="unfinished">Bitrate Medio</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -14766,7 +15117,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -15025,7 +15376,12 @@
 <translation type="unfinished">31</translation>
 </message>
 <message>
- <location line="+1916"/>
+ <location line="+171"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1745"/>
 <source>Normal</source>
 <translation type="unfinished">Normal</translation>
 </message>
@@ -15256,12 +15612,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>10 (Best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16081,7 +16432,7 @@
 <translation type="unfinished">Personalizar</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Bitrate Buscado</translation>
 </message>
@@ -16208,12 +16559,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">Borrar</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16393,12 +16744,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -16435,12 +16786,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16738,7 +17089,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts Changed

@@ -984,7 +984,7 @@
 <translation type="obsolete">Badaiteke aurkibide agiri zahar batekin elkartua izatea.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
 <source>Cannot find a demuxer for %s</source>
 <translation>Ezin da desmultiplexatzailea aurkitu %s-rako</translation>
 </message>
@@ -994,6 +994,36 @@
 <translation>%s irekitze saiatze hutsegitea!</translation>
 </message>
 <message>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatinate them together</source>
@@ -1078,7 +1108,17 @@
 <translation type="obsolete">Aurkibidetze hutsegitea</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+69"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -1095,14 +1135,14 @@
 Erori denborapen argibideak?</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+26"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-18"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1491,11 +1531,11 @@
 <translation type="vanished">_Hutsaltasun mota:</translation>
 </message>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="vanished">_Hasiera Denbora (sm):</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="vanished">_Amaiera Denbora (sm):</translation>
 </message>
 <message>
@@ -2717,7 +2757,7 @@
 <translation type="obsolete">&lt;b&gt;Bideoa&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation>Kopiatu</translation>
@@ -2731,7 +2771,7 @@
 <translation>Itxuratu</translation>
 </message>
 <message>
- <location line="-669"/>
+ <location line="-671"/>
 <source>&amp;Recent</source>
 <translation>Az&amp;kenak</translation>
 </message>
@@ -2744,7 +2784,7 @@
 <translation type="vanished">&lt;b&gt;Bideo Dekodeatzailea&lt;b&gt;</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+154"/>
 <location line="+7"/>
 <source>XXXX</source>
 <translation>XXXX</translation>
@@ -2792,7 +2832,7 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation>...</translation>
 </message>
@@ -2809,12 +2849,12 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation>Denbora:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation>00:00:00.000</translation>
 </message>
@@ -2853,7 +2893,7 @@
 <translation>B:</translation>
 </message>
 <message>
- <location line="-1389"/>
+ <location line="-1392"/>
 <source>Vi&amp;deo</source>
 <translation>&amp;Bideoa</translation>
 </message>
@@ -2928,7 +2968,7 @@
 <translation>&amp;Tresnak</translation>
 </message>
 <message>
- <location line="+407"/>
+ <location line="+393"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation>&lt;b&gt;Audio Irteera&lt;/b&gt;</translation>
 </message>
@@ -2938,7 +2978,7 @@
 <translation> (0 bide)</translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+212"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
 <translation>&lt;b&gt;Irteera Heuskarria&lt;/b&gt;</translation>
 </message>
@@ -2947,7 +2987,7 @@
 <translation type="vanished">Nabigazioa</translation>
 </message>
 <message>
- <location line="+604"/>
+ <location line="+605"/>
 <source>Frame type:</source>
 <translation>Frame mota:</translation>
 </message>
@@ -2964,7 +3004,7 @@
 <translation type="vanished">Audio Neurgailua</translation>
 </message>
 <message>
- <location line="+323"/>
+ <location line="+319"/>
 <source>&amp;Open...</source>
 <translation>&amp;Ireki...</translation>
 </message>
@@ -3074,7 +3114,7 @@
 <translation type="obsolete">Gorde JPEG Irudia</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation>Gertatu/Ekin Egitas&amp;moa...</translation>
 </message>
@@ -3471,13 +3511,18 @@
 <translation>Ctrl+Alt+C</translation>
 </message>
 <message>
- <location line="-926"/>
- <location line="+937"/>
+ <location line="-935"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation>&amp;Nabigazioa</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-291"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+294"/>
 <source>Ctrl+Alt+N</source>
 <translation>Ctrl+Alt+N</translation>
 </message>
@@ -3598,7 +3643,7 @@
 <translation type="obsolete">Bideo CD-a</translation>
 </message>
 <message>
- <location line="-1662"/>
+ <location line="-1671"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3683,7 +3728,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+178"/>
+ <location line="+179"/>
 <source>Se&amp;lection</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3698,17 +3743,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4112,6 +4152,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -4330,6 +4378,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -4843,7 +4896,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -4877,7 +4930,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>E_zker hertza:</translation>
 </message>
@@ -4964,7 +5017,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="+367"/>
 <source>Stereo</source>
 <translation>Estereoa</translation>
 </message>
@@ -5110,7 +5163,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+121"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -5120,7 +5173,7 @@
 <translation>Eraiketa Sostengua</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation>DenboraIrarketa:</translation>
 </message>
@@ -5156,13 +5209,13 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation>Audioa</translation>
 </message>
@@ -5263,12 +5316,12 @@
 <translation type="vanished">Dekodeatu bideoa VDPAU erabiliz</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+7"/>
 <source>Enable openGl support</source>
 <translation>Gaitu openGl sostengua</translation>
 </message>
@@ -5277,14 +5330,13 @@
 <translation type="vanished">_Erabili sistema-erretilua kodeatzerakoan</translation>
 </message>
 <message>
- <location line="+6"/>
+ <location line="+5"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Onartu audio maiztasun ez-estandarra DVD-rako</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation>Sortu _OpenDML agiriak</translation>
+ <translation type="vanished">Sortu _OpenDML agiriak</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -5409,22 +5461,21 @@
 <translation>Lehentasunpena</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Split MPEG files every (MB):</source>
- <translation>_Banandu MPEG agiriak zatika (MB):</translation>
+ <translation type="vanished">_Banandu MPEG agiriak zatika (MB):</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation>_Erabili aukerazko etiketak MP3-rako .mp4-an</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation>XVideo (hoberena)</translation>
 </message>
@@ -5483,7 +5534,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -5556,7 +5607,7 @@
 <translation>Bideoa</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+48"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+53"/>
 <source>Threading</source>
 <translation>Hariak</translation>
 </message>
@@ -5582,7 +5633,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+125"/>
+ <location filename="../../common/gui_save.cpp" line="+282"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation>Lerrokatu</translation>
@@ -5599,11 +5650,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation>Gorde JPEG bezala</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>Itxi</translation>
 </message>
@@ -5703,12 +5764,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>Iragazkiak</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>Hautatu Bidea</translation>
 </message>
@@ -5889,12 +5955,12 @@
 Hau beharrezkoa da PSP bateragarri bideoa sortzeko.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+188"/>
+ <location filename="../../common/gui_main.cpp" line="+189"/>
 <source>Select script to save</source>
 <translation>Hautatu gordetzeko eskripta</translation>
 </message>
 <message>
- <location line="+164"/>
+ <location line="+168"/>
 <source>Not coded in this version</source>
 <translation>Kodeatu gabe bertsio honetan</translation>
 </message>
@@ -5907,12 +5973,41 @@
 <translation type="vanished">Hautatu Eransteko AVI Agiria...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation>Zihur zaude?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation>Baimen akatsa</translation>
 </message>
@@ -6008,7 +6103,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation>Zerbait gaitza gertatu da</translation>
 </message>
@@ -6023,7 +6118,7 @@
 <translation>Audio Bide Nagusia</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation>AvsProxy</translation>
 </message>
@@ -6055,7 +6150,7 @@
 <translation>Frame Hex Iraulketa</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-376"/>
+ <location filename="../../common/gui_save.cpp" line="-539"/>
 <source>Output file</source>
 <translation>Irteera agiria</translation>
 </message>
@@ -6095,6 +6190,11 @@
 <translation>Hautatu Gordetzeko JPEG-a</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation>Hautatu Gordetzeko Agiria</translation>
@@ -6105,49 +6205,45 @@
 <translation>Audioa gordetzen</translation>
 </message>
 <message>
- <location line="+148"/>
+ <location line="+211"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Fail to save as jpeg</source>
- <translation>Hutsegitea jpeg bezala gordetzerakoan</translation>
+ <translation type="vanished">Hutsegitea jpeg bezala gordetzerakoan</translation>
 </message>
 <message>
- <location line="+31"/>
 <source>Saving as set of jpegs</source>
- <translation>jpeg ezarpen bezala gordetzen</translation>
+ <translation type="vanished">jpeg ezarpen bezala gordetzen</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation>Ezinezkoa framea dekodeatzea</translation>
+ <translation type="vanished">Ezinezkoa framea dekodeatzea</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation>Uzten.</translation>
+ <translation type="vanished">Uzten.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+97"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation>Eginda</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation>%d irudi gordeta.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -6158,12 +6254,11 @@
 <translation>Akatsa</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation>Ezinezkoa agiri guztiak gordetzea.</translation>
+ <translation type="vanished">Ezinezkoa agiri guztiak gordetzea.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation>BMP op hutsegitea</translation>
 </message>
@@ -6173,7 +6268,7 @@
 <translation>Hutsegitea %s BMP agiri bat bezala gordetzerakoan.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation>%s agiria ongi gorde da.</translation>
 </message>
@@ -6511,17 +6606,22 @@
 <translation type="vanished">Azken Egitasmoak</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished">Gordetzen</translation>
 </message>
 <message>
+ <location line="+165"/>
+ <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/ADM_commonUI/DIA_audioFilter.cpp" line="-8"/>
 <source>Mixer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6536,17 +6636,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+4"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+80"/>
+ <location line="+57"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
 <source>LIBVA (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6587,12 +6697,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6602,7 +6713,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-63"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-64"/>
 <source>Pr&amp;eferences</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6612,8 +6723,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -6647,7 +6758,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6667,7 +6778,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -6688,7 +6799,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6698,7 +6817,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -6729,7 +6848,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Ustekabea</translation>
 </message>
@@ -6739,12 +6858,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Arazoak audio gailua abiarazterakoan</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-367"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>No</source>
 <translation type="unfinished">Ez</translation>
 </message>
@@ -6764,7 +6883,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+219"/>
+ <location line="+225"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -6780,7 +6899,42 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+125"/>
+ <location line="+84"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6977,26 +7131,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Oroimen akatsa</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
 <source>Unknown</source>
@@ -7089,7 +7238,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -7117,6 +7266,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -7514,16 +7707,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">_Hasiera Denbora (sm):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Hasiera Denbora:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">_Amaiera Denbora (sm):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Amaiera Denbora:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7672,7 +7865,7 @@
 <translation>59.93 (NTSC)</translation>
 </message>
 <message>
- <location line="+162"/>
+ <location line="+174"/>
 <source>Source Fps:</source>
 <translation>Iturburu Fs-ko:</translation>
 </message>
@@ -7697,7 +7890,7 @@
 <translation>Aldatu fs-ko</translation>
 </message>
 <message>
- <location line="-145"/>
+ <location line="-156"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7707,7 +7900,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+149"/>
+ <location line="+160"/>
 <source>Error</source>
 <translation type="unfinished">Akatsa</translation>
 </message>
@@ -7896,7 +8089,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Zuribeltztasuna</translation>
 </message>
@@ -7906,8 +8099,8 @@
 <translation>Zehaztu zuribeltztasuna, dizdira eta margoak.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8039,7 +8232,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -8050,6 +8243,11 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -8061,40 +8259,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished">Eskuin:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished">Goi:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished">Birrezarri</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished">Behe:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished">Ezker:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished">Berez Moztu</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -8312,40 +8520,42 @@
 <translation>Kodeatzen...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation>Aldia:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
 <translation>Bideo Kodeka:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation>Ezer ez</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation>Ezezaguna</translation>
 </message>
 <message>
+ <location line="+14"/>
 <source>Container:</source>
- <translation type="obsolete">Edukiontzia:</translation>
+ <translation type="unfinished">Edukiontzia:</translation>
 </message>
 <message>
+ <location line="-21"/>
 <source>Audio Codec:</source>
- <translation type="obsolete">Audio Kodeka:</translation>
+ <translation type="unfinished">Audio Kodeka:</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+141"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation>0</translation>
 </message>
@@ -8355,190 +8565,188 @@
 <translation>00:00:00</translation>
 </message>
 <message>
+ <location line="-7"/>
 <source>Elapsed:</source>
- <translation type="obsolete">Igarota:</translation>
+ <translation type="unfinished">Igarota:</translation>
 </message>
 <message>
+ <location line="-379"/>
 <source>Time Remaining:</source>
- <translation type="obsolete">Gelditzen dena:</translation>
+ <translation type="unfinished">Gelditzen dena:</translation>
 </message>
 <message>
+ <location line="+400"/>
 <source>Frames/sec:</source>
- <translation type="obsolete">Frame/seg:</translation>
+ <translation type="unfinished">Frame/seg:</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation>0 MB</translation>
 </message>
 <message>
+ <location line="-28"/>
 <source>Total Size:</source>
- <translation type="obsolete">Neurria Guztira:</translation>
+ <translation type="unfinished">Neurria Guztira:</translation>
 </message>
 <message>
+ <location line="-7"/>
 <source>Audio Size:</source>
- <translation type="obsolete">Audio Neurria:</translation>
+ <translation type="unfinished">Audio Neurria:</translation>
 </message>
 <message>
+ <location line="+28"/>
 <source>Video Size:</source>
- <translation type="obsolete">Bideo Neurria:</translation>
+ <translation type="unfinished">Bideo Neurria:</translation>
 </message>
 <message>
+ <location line="+61"/>
 <source>Processed Frames:</source>
- <translation type="obsolete">Prozesatutako Frameak:</translation>
+ <translation type="unfinished">Prozesatutako Frameak:</translation>
 </message>
 <message>
 <source>Total Frames:</source>
 <translation type="obsolete">Frameak Guztira:</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+14"/>
 <source>0 kB/s</source>
 <translation>0 kB/s</translation>
 </message>
 <message>
+ <location line="-31"/>
 <source>Average Bitrate:</source>
- <translation type="obsolete">Bataz-besteko Bitneurria:</translation>
+ <translation type="unfinished">Bataz-besteko Bitneurria:</translation>
 </message>
 <message>
+ <location line="+24"/>
 <source>Quantiser:</source>
- <translation type="obsolete">Kuantizatzailea:</translation>
+ <translation type="unfinished">Kuantizatzailea:</translation>
 </message>
 <message>
- <location line="-171"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Edukiontzia:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="-24"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Kodeka:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+236"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Igarota:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="-412"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Gelditzen Da:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+436"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frame/seg:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="-176"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Neurria Guztira:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="-10"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Neurria:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+34"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Bideo Neurria:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+67"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Prozesatutako Frameak:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="-20"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Bataz-besteko Bitneurria:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="+30"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Kuantizatzailea:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
 <message>
- <location line="-347"/>
+ <location line="-320"/>
 <source>Shut down computer when finished</source>
 <translation>Itzali ordenagailua amaitutakoan</translation>
 </message>
 <message>
- <location line="-62"/>
+ <location line="-53"/>
 <source>Main</source>
 <translation type="unfinished">Nagusia</translation>
 </message>
 <message>
- <location line="+82"/>
+ <location line="+73"/>
 <source>Priority:</source>
 <translation>Lehentasuna:</translation>
 </message>
@@ -8627,7 +8835,7 @@
 <translation>Zehaztu zuribeltztasuna, dizdira, margoasetasuna eta gamma.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8713,6 +8921,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -8725,11 +8938,11 @@
 <translation type="vanished">Hutsaltasuna sar/irt.</translation>
 </message>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="obsolete">_Hasiera Denbora (sm):</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="obsolete">_Amaiera Denbora (sm):</translation>
 </message>
 <message>
@@ -8761,41 +8974,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">_Hasiera Denbora (sm):</translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Hasiera Denbora:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">_Amaiera Denbora (sm):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Amaiera Denbora:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished">Hutsaldu beltzera</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Irteera</translation>
 </message>
@@ -8815,19 +9028,19 @@
 <translation type="unfinished">Sarrera baterapena</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">_Hutsaltasun mota:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">_Hasiera Denbora (sm):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Hasiera Denbora:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">_Amaiera Denbora (sm):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Amaiera Denbora:</translation>
 </message>
 </context>
 <context>
@@ -9347,8 +9560,8 @@
 <translation type="unfinished">libavcodec MPEG-4 itxurapena</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -9389,6 +9602,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -9397,6 +9625,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -9410,7 +9643,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9545,6 +9798,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -10329,8 +10640,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation>erabili QT4 bertsioa</translation>
+ <source>use Qt version</source>
+ <translation>erabili Qt bertsioa</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -10882,6 +11193,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -10912,18 +11228,18 @@
 <translation type="unfinished">Y</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -11183,12 +11499,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation>Mkv gordeketa</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11198,7 +11514,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11289,7 +11610,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Arazoak SVQ3 idazburuak irakurtzean</translation>
 </message>
@@ -11301,7 +11622,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">Ez-sostengatua</translation>
@@ -11317,7 +11638,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished">mp4 gordetzea</translation>
 </message>
@@ -11327,7 +11648,7 @@
 <translation type="unfinished">PSP gordetzea</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11337,6 +11658,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -11564,12 +11895,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Akatsa</translation>
 </message>
@@ -11681,7 +12012,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Idazburu gaizkieratua</translation>
 </message>
@@ -11694,13 +12025,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -11942,7 +12273,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Akatsa</translation>
 </message>
@@ -11971,18 +12302,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Akatsa</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12007,7 +12338,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12027,7 +12358,7 @@
 <translation type="unfinished">Erro eskubideak beharrezkoak dira eragiketa hau burutzeko.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12085,7 +12416,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished">Azken Agiriak</translation>
 </message>
@@ -12095,7 +12426,7 @@
 <translation type="unfinished">Azken Egitasmoak</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12160,7 +12491,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -12171,7 +12502,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12319,7 +12650,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12359,7 +12690,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12395,7 +12726,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation>Ez</translation>
 </message>
@@ -12411,12 +12742,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation>%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12492,7 +12823,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation>%s (%u:%u)</translation>
 </message>
@@ -12683,7 +13014,7 @@
 <translation>59.93 (NTSC)</translation>
 </message>
 <message>
- <location line="+310"/>
+ <location line="+313"/>
 <source>_Mode:</source>
 <translation>_Modua:</translation>
 </message>
@@ -12698,7 +13029,7 @@
 <translation>Birlaginketa fs-ko</translation>
 </message>
 <message>
- <location line="-282"/>
+ <location line="-285"/>
 <source>Resample FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12711,7 +13042,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Zabalera eta garaiera ezin dira eta piku izan</translation>
 </message>
@@ -12774,7 +13105,6 @@
 <translation type="unfinished">Blokeatu Ikuspegi Maila</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -12791,8 +13121,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -12817,8 +13145,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -12843,8 +13169,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -12868,7 +13192,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -12882,7 +13205,23 @@
 <translation type="unfinished">Helmuga:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -13298,6 +13637,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -13495,6 +13858,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -13508,16 +13889,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Aurkibidetzen</translation>
@@ -13539,7 +13920,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation>X11</translation>
 </message>
@@ -13588,6 +13969,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -13621,24 +14023,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpauVideoFilterDeint</name>
 <message>
 <source>Keep Top Field</source>
@@ -14166,7 +14550,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14212,7 +14596,7 @@
 <translation type="unfinished">Bataz-besteko Bitneurria:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -14230,7 +14614,7 @@
 Jarraitzea nahi duzu?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -14462,12 +14846,11 @@
 <translation type="unfinished">Azpipixela Irazketa</translation>
 </message>
 <message>
- <location line="+20"/>
 <source>10 (Best)</source>
- <translation type="unfinished">10 (Hobea)</translation>
+ <translation type="obsolete">10 (Hobea)</translation>
 </message>
 <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation type="unfinished">Mugimendu Bektorea</translation>
 </message>
@@ -15148,7 +15531,12 @@
 <translation type="unfinished">31</translation>
 </message>
 <message>
- <location line="+2482"/>
+ <location line="+171"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2311"/>
 <source>Generate Access Unit Delimiters</source>
 <translation type="unfinished">Sortu Sarbide Batasun Mugatzaileak</translation>
 </message>
@@ -15679,7 +16067,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Xede Bitneurria:</translation>
 </message>
@@ -15810,12 +16198,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">Ezabatu</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished">Orokorra</translation>
 </message>
@@ -15995,12 +16383,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished">Kuantizatzailea</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished">51 (Ontasun Apala)</translation>
@@ -16037,12 +16425,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished">frame</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished">Sekuentzia Parametro Ezarpen Ezautzailea:</translation>
 </message>
@@ -16340,7 +16728,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished">Kuantizazioa Matriza</translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -139,7 +139,17 @@
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+69"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -155,7 +165,7 @@
 Ignorer les informations de timing ?</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
 <source>Cannot find a demuxer for %s</source>
 <translation>Impossible de trouver un demuxer pour lire %s</translation>
 </message>
@@ -165,13 +175,43 @@
 <translation>l&apos;ouverture de %s a echouée !</translation>
 </message>
 <message>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatinate them together</source>
 <translation type="vanished">Vous ne pouvez pas mélanger des videos avec des dimensions différentes. Pour ce faire, editer les vidéos avec les filtres resize/etc.. afin qu&apos;elles aient toutes la même taille, puis les ajouter</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
@@ -180,7 +220,7 @@
 2) Concaténer ces videos ensembles</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-18"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
 <source>Checking if timestamps are valid..</source>
 <translation>Vérification des informations de temps</translation>
 </message>
@@ -298,11 +338,11 @@
 <context>
 <name>AVDM_Fade</name>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="obsolete">Début (ms):</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="obsolete">Fin(ms):</translation>
 </message>
 <message>
@@ -849,7 +889,7 @@
 <translation type="obsolete">Options</translation>
 </message>
 <message>
- <location line="+182"/>
+ <location line="+184"/>
 <location line="+142"/>
 <location line="+169"/>
 <location line="+181"/>
@@ -874,7 +914,7 @@
 <translation>Filtres</translation>
 </message>
 <message>
- <location line="-112"/>
+ <location line="-128"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation>&lt;b&gt;Sortie Audio&lt;/b&gt;</translation>
 </message>
@@ -884,7 +924,7 @@
 <translation> (0 piste(s))</translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation>&amp;Décal.:</translation>
 </message>
@@ -894,7 +934,12 @@
 <translation>&lt;b&gt;Format de sortie&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+927"/>
+ <location line="+769"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+155"/>
 <source>&amp;Open...</source>
 <translation>&amp;Ouvrir...</translation>
 </message>
@@ -910,7 +955,7 @@
 <translation>Sauver</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation>&amp;Lancer un projet...</translation>
 </message>
@@ -967,7 +1012,7 @@
 <translation>Cot&amp;e à cote</translation>
 </message>
 <message>
- <location line="-1786"/>
+ <location line="-1797"/>
 <source>Vi&amp;deo</source>
 <translation></translation>
 </message>
@@ -1002,7 +1047,7 @@
 <translation>&amp;Récent</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation></translation>
 </message>
@@ -1024,12 +1069,12 @@
 </message>
 <message>
 <location line="+149"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation>Lire [SPACE]</translation>
 </message>
@@ -1052,12 +1097,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished">Image précédente [GAUCHE]</translation>
 </message>
@@ -1127,7 +1172,7 @@
 <translation>Temps:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation></translation>
 </message>
@@ -1178,17 +1223,16 @@
 <translation>Aller au marqueur B [PAGE BAS]</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>Display output video on playback</source>
- <translation type="unfinished">Jouer la vidéo post filtrage</translation>
+ <translation type="obsolete">Jouer la vidéo post filtrage</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation>Jouer post filtrage</translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation></translation>
 </message>
@@ -1213,7 +1257,7 @@
 <translation></translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+69"/>
 <source>F7</source>
 <translation></translation>
 </message>
@@ -1284,6 +1328,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>SpiderMonkeyShell</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
@@ -1327,6 +1379,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation></translation>
 </message>
@@ -1355,7 +1412,7 @@
 </message>
 <message>
 <location line="+29"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -1377,7 +1434,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>Bord gauche:</translation>
 </message>
@@ -1425,12 +1482,12 @@
 <translation type="obsolete">Utiliser VDPAU pour décoder</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Utiliser DXVA2 pour décoder (Windows)</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+7"/>
 <source>Enable openGl support</source>
 <translation>Activer OpenGL</translation>
 </message>
@@ -1439,14 +1496,13 @@
 <translation type="vanished">Réduire dans la barre de taches</translation>
 </message>
 <message>
- <location line="+6"/>
+ <location line="+5"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>Accepter les fréquences non standard pour les DVDs</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation>Créer des fichiers OpenDML</translation>
+ <translation type="vanished">Créer des fichiers OpenDML</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -1561,22 +1617,21 @@
 <translation>Priorités</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Split MPEG files every (MB):</source>
- <translation>Créer un nouveau fichier MPEG tous les (MB):</translation>
+ <translation type="vanished">Créer un nouveau fichier MPEG tous les (MB):</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation>Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <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="+5"/>
+ <location line="+6"/>
 <source>XVideo (best)</source>
 <translation>Xvideo (rapide)</translation>
 </message>
@@ -1714,11 +1769,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation>Sauver comme JPEG</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>Fermer</translation>
 </message>
@@ -1806,12 +1871,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>Filtres</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>Choisir les pistes</translation>
 </message>
@@ -2081,17 +2151,17 @@
 <translation type="vanished">Impossible de choisir le codec mpeg4sp.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+188"/>
+ <location filename="../../common/gui_main.cpp" line="+189"/>
 <source>Select script to save</source>
 <translation>Choisir le script à sauvegarder</translation>
 </message>
 <message>
- <location line="+405"/>
+ <location line="+419"/>
 <source>Are you sure?</source>
 <translation>Etes vous sur ?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <location line="+181"/>
 <source>Cannot open &quot;%s&quot;.</source>
 <translation>Impossible d&apos;ouvrir &quot;%s&quot;.</translation>
 </message>
@@ -2112,7 +2182,7 @@
 </message>
 <message>
 <location line="+371"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation>Quelque chose d&apos;anormal c&apos;est produit</translation>
 </message>
@@ -2263,7 +2333,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+121"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
 <source>CPU</source>
 <translation></translation>
 </message>
@@ -2273,7 +2343,7 @@
 <translation>Options activées</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation></translation>
 </message>
@@ -2309,13 +2379,13 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation></translation>
 </message>
@@ -2390,7 +2460,7 @@
 <translation>Deringing</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-239"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-238"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation>Utiliser VDPAU pour décoder (NVIDIA)</translation>
 </message>
@@ -2405,12 +2475,17 @@
 <translation>Utiliser LIBVA pour décoder (INTEL/...)</translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+4"/>
 <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="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
 <translation>Vérifier si il y a de nouvelle version</translation>
 </message>
@@ -2425,7 +2500,12 @@
 <translation></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+21"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
 <source>LIBVA (best)</source>
 <translation></translation>
 </message>
@@ -2437,7 +2517,7 @@
 </message>
 <message>
 <location line="+15"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation></translation>
 </message>
@@ -2492,12 +2572,13 @@
 <translation>Affichage</translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation>Accel. HW</translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Threading</source>
 <translation></translation>
 </message>
@@ -2517,14 +2598,14 @@
 <translation>Préférences</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-106"/>
- <location filename="../../common/gui_save.cpp" line="+125"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-109"/>
+ <location filename="../../common/gui_save.cpp" line="+282"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation>Mettre en queue</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+7"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -2546,15 +2627,15 @@
 <translation>Sauver les réglages courants comme défaut</translation>
 </message>
 <message>
- <location line="+24"/>
+ <location line="+25"/>
 <source>Plugins</source>
 <translation></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="+147"/>
@@ -2562,14 +2643,14 @@
 <location line="+24"/>
 <location line="+8"/>
 <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="-64"/>
+ <location filename="../../common/gui_save.cpp" line="-109"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>Erreur</translation>
 </message>
 <message>
- <location line="-42"/>
- <location line="+42"/>
+ <location line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation>Vous ne pouvez pas *tout* enlever</translation>
@@ -2620,7 +2701,7 @@
 Il est nécessaire pour créer un fichier compatible PSP</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation>Choisir un script/projet à lancer</translation>
 </message>
@@ -2640,7 +2721,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+97"/>
+ <location line="+101"/>
 <source>Not coded in this version</source>
 <translation>Pas disponible dans cette version</translation>
 </message>
@@ -2666,17 +2747,54 @@
 <translation>Choisir le fichier à concatener</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
+ <location line="-20"/>
+ <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>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+16"/>
 <source>Error while cutting out.</source>
 <translation>Erreur lors de la coupe</translation>
 </message>
 <message>
- <location line="+72"/>
+ <location line="+8"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation>Erreur de permission</translation>
 </message>
@@ -2791,7 +2909,7 @@
 <translation>Impossible de choisir la langue, piste audio invalide</translation>
 </message>
 <message>
- <location line="+138"/>
+ <location line="+141"/>
 <source>AvsProxy</source>
 <translation></translation>
 </message>
@@ -2832,12 +2950,12 @@
 <translation>Cette fonction est désactivée ou plus disponible.</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation>Le device audio ne peut pas être initialisé</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-327"/>
+ <location filename="../../common/gui_save.cpp" line="-445"/>
 <source>No</source>
 <translation>Non</translation>
 </message>
@@ -2897,6 +3015,11 @@
 <translation>Choisir l&apos;image Jpeg à sauver</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation>Choisir le fichier à écrire</translation>
@@ -2923,48 +3046,66 @@
 <translation>La sauvegarde a échoué</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
- <translation>Impossible de sauvegarder le jpeg</translation>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
- <source>Saving as set of jpegs</source>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Cannot decode frame</source>
+ <location line="+20"/>
+ <source>Warning</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Aborting.</source>
+ <source>Maximum number of 9999 images reached, aborting.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fail to save as jpeg</source>
+ <translation type="vanished">Impossible de sauvegarder le jpeg</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation>Fait</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation>%d images sauvées.</translation>
 </message>
 <message>
- <location line="+2"/>
 <source>Could not save all images.</source>
- <translation>Impossible d&apos;enregistrer toutes les images.</translation>
+ <translation type="vanished">Impossible d&apos;enregistrer toutes les images.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+63"/>
 <source>BMP op failed</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2974,7 +3115,7 @@
 <translation>L&apos;enregistrement %s en tant que fichier BMP échoué</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation>Le fichier %s a été enregistré avec succès.</translation>
 </message>
@@ -3427,29 +3568,33 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Impossible d&apos;allouer la mémoire</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
+ <location line="+165"/>
+ <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 line="+6"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
 <source>The video has been saved but seems to be incomplete.</source>
- <translation>La vidéo a été sauvegardée mais semble incompléte</translation>
+ <translation type="vanished">La vidéo a été sauvegardée mais semble incompléte</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
@@ -3547,7 +3692,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -3576,6 +3721,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -3941,24 +4130,24 @@
 <translation type="unfinished">Remplacer une portion de la video par du noir</translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+16"/>
 <source>Replace by Black</source>
 <translation type="unfinished">Remplacer par du noir</translation>
 </message>
 <message>
- <location line="-16"/>
+ <location line="-17"/>
 <source>Black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+13"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Début (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Début:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Fin(ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Fin:</translation>
 </message>
 </context>
 <context>
@@ -4057,7 +4246,7 @@
 <translation>Manuel</translation>
 </message>
 <message>
- <location line="+167"/>
+ <location line="+179"/>
 <source>Source Fps:</source>
 <translation type="unfinished">Source:</translation>
 </message>
@@ -4091,7 +4280,7 @@
 <translation type="obsolete">Nouveau nombre d&apos;i/s:</translation>
 </message>
 <message>
- <location line="-185"/>
+ <location line="-197"/>
 <source>25 (PAL)</source>
 <translation type="unfinished">25 (Pal/Secam)</translation>
 </message>
@@ -4116,7 +4305,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished">Changer le nombre d&apos; I/S</translation>
 </message>
@@ -4126,7 +4315,7 @@
 <translation type="unfinished">Accélère/Ralentit la vidéo en modifiant le nombre d&apos;i/s. La durée est modifiée.</translation>
 </message>
 <message>
- <location line="+149"/>
+ <location line="+160"/>
 <source>Error</source>
 <translation type="unfinished">Erreur</translation>
 </message>
@@ -4290,7 +4479,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4300,8 +4489,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4411,7 +4600,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -4422,6 +4611,11 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -4433,40 +4627,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -4673,30 +4877,45 @@
 <translation type="unfinished">Encodage...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation type="unfinished">Phases:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+180"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Video Codec:</source>
 <translation type="unfinished">Codec Vidéo:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Aucun</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Inconnu</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="-180"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation type="unfinished">Priorité:</translation>
 </message>
@@ -4731,137 +4950,89 @@
 <translation type="unfinished">Pause/Abandon</translation>
 </message>
 <message>
- <location line="-158"/>
- <source>Main</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+48"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+128"/>
+ <source>Audio Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <source>Shut down computer when finished</source>
+ <location line="+7"/>
+ <source>Total Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
- <source>Minimize to Tray</source>
+ <location line="+21"/>
+ <source>Video Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
- <source>Advanced</source>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+53"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+17"/>
+ <source>Processed Frames:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+7"/>
+ <source>Quantiser:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+48"/>
+ <source>Elapsed:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Frames/sec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+7"/>
- <location line="+17"/>
- <source>0 MB</source>
+ <location line="-442"/>
+ <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+53"/>
+ <source>Shut down computer when finished</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+76"/>
+ <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+37"/>
- <location line="+51"/>
- <source>0</source>
+ <location line="+33"/>
+ <source>Advanced</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-78"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+129"/>
+ <location line="+7"/>
+ <location line="+14"/>
+ <source>0 MB</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+44"/>
+ <location line="+31"/>
+ <location line="+48"/>
+ <source>0</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="-55"/>
 <source>0 kB/s</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+48"/>
 <source>00:00:00</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+14"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>eq2</name>
@@ -4876,7 +5047,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4942,15 +5113,20 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="obsolete">Début (ms):</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="obsolete">Fin(ms):</translation>
 </message>
 <message>
@@ -4962,41 +5138,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Début (ms):</translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Début:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Fin(ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Fin:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished">Fondu au noir</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5016,19 +5192,19 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Début (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Début:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Fin(ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Fin:</translation>
 </message>
 </context>
 <context>
@@ -5543,8 +5719,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -5585,6 +5761,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -5593,6 +5784,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -5606,7 +5802,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5746,6 +5962,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -6486,12 +6760,12 @@
 <message>
 <location line="+7"/>
 <source>If you use VDPAU you cannot use CLI version</source>
- <translation type="unfinished">Si vous utilisez VDAU, la version CLI ne marchera pas</translation>
+ <translation type="unfinished">Si vous utilisez VDPAU, la version CLI ne marchera pas</translation>
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation type="unfinished">Utiliser la version Qt4</translation>
+ <source>use Qt version</source>
+ <translation type="unfinished">Utiliser la version Qt</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -6915,6 +7189,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished">Choisir l&apos;image</translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -6945,18 +7224,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -7320,12 +7599,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Sauvegarde au format MKV (ff)</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7335,7 +7614,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7418,7 +7702,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Impossible de lire l&apos;entete SVQ3</translation>
 </message>
@@ -7430,7 +7714,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished"></translation>
@@ -7446,7 +7730,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Sauvegarde au format MP4</translation>
 </message>
@@ -7456,7 +7740,7 @@
 <translation type="unfinished">Sauvegarde au format PSP</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7466,6 +7750,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -7688,12 +7982,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Erreur</translation>
 </message>
@@ -7767,7 +8061,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">En tete incorrecte</translation>
 </message>
@@ -7780,14 +8074,14 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
- <translation type="unfinished"></translation>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Début:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
- <translation type="unfinished"></translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Fin:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7919,7 +8213,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation>Erreur</translation>
 </message>
@@ -7949,18 +8243,18 @@
 <translation>Sélectionner un fichier audio</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation>Erreur</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation>Impossible d&apos;utiliser ce fichier comme piste audio</translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation>Certaines pistes sont utilisées plusieurs fois</translation>
 </message>
@@ -7985,7 +8279,7 @@
 <translation>... Ajouter une piste audio</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation>copier</translation>
 </message>
@@ -8005,7 +8299,7 @@
 <translation>Les privilèges root sont requis pour effectuer cette opération.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8063,7 +8357,7 @@
 <translation>&lt;b&gt;Nouvelle version disponible&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Publié le %2.&lt;br&gt;Vous pouvez la télécharger ici&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Vous pouvez désactiver autoupdate dans les préférences.&lt;/small&gt;</translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation>Fichiers Récents</translation>
 </message>
@@ -8073,7 +8367,7 @@
 <translation>Projets Récents</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8138,7 +8432,7 @@
 <translation>Avancer d&apos;une minute</translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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
@@ -8150,7 +8444,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation> (%d piste(s))</translation>
 </message>
@@ -8298,7 +8592,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation>Partiel</translation>
 </message>
@@ -8338,7 +8632,7 @@
 <translation>Faire partiel</translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation>Charger les filtres vidéo..</translation>
 </message>
@@ -8374,7 +8668,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation>Non</translation>
 </message>
@@ -8390,12 +8684,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8471,7 +8765,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8617,12 +8911,12 @@
 <translation type="unfinished">Change le nombre d&apos;i/s, conserve la synchronisation et la durée</translation>
 </message>
 <message>
- <location line="+275"/>
+ <location line="+278"/>
 <source>_New frame rate:</source>
 <translation type="unfinished">&amp;Nouveau nombre d&apos;i/s:</translation>
 </message>
 <message>
- <location line="-315"/>
+ <location line="-318"/>
 <source>25 (PAL)</source>
 <translation type="unfinished">25 (PAL/SECAM)</translation>
 </message>
@@ -8647,7 +8941,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+310"/>
+ <location line="+313"/>
 <source>_Mode:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8660,7 +8954,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation>La largeur ou la hauteur ne peuvent être impaires</translation>
 </message>
@@ -8723,7 +9017,23 @@
 <translation>Vérrouiller le rapport h/l</translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+104"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+104"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+104"/>
@@ -8873,7 +9183,6 @@
 <translation>Lanzcos3</translation>
 </message>
 <message>
- <location line="-398"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-398"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-398"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-398"/>
@@ -8890,8 +9199,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -8916,8 +9223,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8942,8 +9247,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8967,7 +9270,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -8981,7 +9283,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+190"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="-166"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+190"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+190"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+190"/>
@@ -9189,6 +9491,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Début:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished">_Fin:</translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -9382,6 +9708,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -9396,16 +9740,16 @@
 Veuillez supprimer le fichier idx2 et rouvrir.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation>Il existe plusieurs fichiers avec des noms de fichiers séquentiels. Devraient-ils tous être chargés?</translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation>Indexation</translation>
@@ -9427,7 +9771,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9476,6 +9820,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -9509,24 +9874,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpauVideoFilter</name>
 <message>
 <source>Width :</source>
@@ -9883,7 +10230,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9929,7 +10276,7 @@
 <translation>Bitrate moyen:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -9947,7 +10294,7 @@
 Voulez vous procéder ?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -10348,7 +10695,7 @@
 </message>
 <message>
 <location line="+20"/>
- <source>10 (Best)</source>
+ <source>11 (Best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -11280,7 +11627,7 @@
 <translation>Manuel</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation>Bitrate cible :</translation>
 </message>
@@ -11412,12 +11759,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation>Effacer</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11597,12 +11944,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -11639,12 +11986,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11942,7 +12289,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts Changed

@@ -4,12 +4,52 @@
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation>A %s megnyitása sikertelen!</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+69"/>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -26,7 +66,7 @@
 Eldobjuk ezeket az időszinkron adatokat ?</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-36"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-69"/>
 <source>Cannot find a demuxer for %s</source>
 <translation>Nem található szétbontó ehhez: %s</translation>
 </message>
@@ -39,14 +79,14 @@
 2) Összefűzni őket</translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+71"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-18"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -607,7 +647,7 @@
 <translation>Avidemux</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation>Másolás</translation>
@@ -645,17 +685,17 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation>…</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation>Idő:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation>00:00:00.000</translation>
 </message>
@@ -680,7 +720,7 @@
 <translation>000000</translation>
 </message>
 <message>
- <location line="-1414"/>
+ <location line="-1417"/>
 <source>&amp;Help</source>
 <translation>&amp;Súgó</translation>
 </message>
@@ -725,7 +765,12 @@
 <translation>U&amp;grás</translation>
 </message>
 <message>
- <location line="+1545"/>
+ <location line="+1389"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+155"/>
 <source>&amp;Open...</source>
 <translation>M&amp;egnyitás…</translation>
 </message>
@@ -751,7 +796,7 @@
 <translation>Videó mentése</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation>Projekt betö&amp;ltése/indítása...</translation>
 </message>
@@ -788,12 +833,12 @@
 <translation>F7</translation>
 </message>
 <message>
- <location line="-1034"/>
+ <location line="-1043"/>
 <source>ms</source>
 <translation>ms</translation>
 </message>
 <message>
- <location line="+763"/>
+ <location line="+764"/>
 <source>A:</source>
 <translation>A:</translation>
 </message>
@@ -803,7 +848,7 @@
 <translation>B:</translation>
 </message>
 <message>
- <location line="+279"/>
+ <location line="+287"/>
 <source>&amp;Input</source>
 <translation>&amp;Bemenet</translation>
 </message>
@@ -823,17 +868,17 @@
 <translation>Fen&amp;t</translation>
 </message>
 <message>
- <location line="-516"/>
+ <location line="-524"/>
 <source>Frame type:</source>
 <translation>Képkocka típus:</translation>
 </message>
 <message>
- <location line="+504"/>
+ <location line="+512"/>
 <source>&amp;Separate</source>
 <translation>&amp;Szeparált</translation>
 </message>
 <message>
- <location line="-1748"/>
+ <location line="-1759"/>
 <source>&amp;Toolbars</source>
 <translation>Eszköz&amp;tárak</translation>
 </message>
@@ -856,7 +901,7 @@
 <translation type="vanished">&lt;b&gt;Videó dekódoló&lt;b&gt;</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+154"/>
 <location line="+7"/>
 <source>XXXX</source>
 <translation>XXXX</translation>
@@ -867,7 +912,7 @@
 <translation>&lt;b&gt;Videó kimenet&lt;b&gt;</translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation>&lt;b&gt;Hang kimenet&lt;b&gt;</translation>
 </message>
@@ -877,7 +922,7 @@
 <translation>(0 sáv)</translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+212"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
 <translation>&lt;b&gt;Kimeneti formátum&lt;/b&gt;</translation>
 </message>
@@ -898,7 +943,7 @@
 <translation type="vanished">Hang méter</translation>
 </message>
 <message>
- <location line="+1037"/>
+ <location line="+1046"/>
 <source>&amp;Codec Options</source>
 <translation>&amp;Kódek beállítás</translation>
 </message>
@@ -908,8 +953,8 @@
 <translation>Alt+Ctrl+C</translation>
 </message>
 <message>
- <location line="-926"/>
- <location line="+937"/>
+ <location line="-935"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation>&amp;Navigálás</translation>
 </message>
@@ -944,7 +989,7 @@
 <translation>Ctrl+Alt+M</translation>
 </message>
 <message>
- <location line="-1650"/>
+ <location line="-1659"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1029,7 +1074,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+178"/>
+ <location line="+179"/>
 <source>Se&amp;lection</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1044,17 +1089,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1081,6 +1121,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Question</source>
@@ -1246,6 +1294,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished">…</translation>
 </message>
@@ -1268,12 +1321,7 @@
 <translation>Videószerkesztő több rendszerhez</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+84"/>
+ <location line="+94"/>
 <source>OK</source>
 <translation>OK</translation>
 </message>
@@ -1283,7 +1331,12 @@
 <translation>http://www.avidemux.org</translation>
 </message>
 <message>
- <location line="+45"/>
+ <location line="-19"/>
+ <source>© 2001 - 2018 Mean</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+64"/>
 <source>&amp;License</source>
 <translation>&amp;Licensz</translation>
 </message>
@@ -1304,7 +1357,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>Balszegély:</translation>
 </message>
@@ -1348,7 +1401,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1357,14 +1410,13 @@
 <translation type="vanished">Tálca (panel) használata a kódolás alatt</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>Nem szabványos DVD hangsáv frekvencia elfogadása</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation>OpenDML fájlok létrehozása</translation>
+ <translation type="vanished">OpenDML fájlok létrehozása</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -1477,16 +1529,21 @@
 <translation>Prioritások beállítása</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation>Alternatív MP3 Tag használata .mp4-ben</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation>XVideo (legjobb)</translation>
@@ -1592,10 +1649,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation>Hang</translation>
 </message>
@@ -1609,7 +1666,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1619,7 +1676,7 @@
 <translation>Szálak</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
 <source>Pr&amp;eferences</source>
 <translation>Beállítások</translation>
 </message>
@@ -1629,7 +1686,7 @@
 <translation>Beállítások</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
 <source>Open</source>
 <translation>Megnyitás</translation>
 </message>
@@ -1645,7 +1702,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+125"/>
+ <location filename="../../common/gui_save.cpp" line="+282"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation>Küldendő</translation>
@@ -1662,11 +1719,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation>JPEG képként ment</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>Bezárás</translation>
 </message>
@@ -1767,12 +1834,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>Szűrők</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>Sáv kiválasztása</translation>
 </message>
@@ -2169,12 +2241,12 @@
 <translation type="vanished">Videó dekódolása VDPAU -val</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-284"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
 <source>Enable openGl support</source>
 <translation>OpenGL engedélyezés</translation>
 </message>
 <message>
- <location line="+51"/>
+ <location line="+49"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
 <source>High</source>
 <translation>Magas</translation>
@@ -2186,12 +2258,11 @@
 <translation>Alacsony</translation>
 </message>
 <message>
- <location line="+11"/>
 <source>_Split MPEG files every (MB):</source>
- <translation>MPEG fájlok darabolandó mérete (MB):</translation>
+ <translation type="vanished">MPEG fájlok darabolandó mérete (MB):</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+21"/>
 <source>VDPAU (best)</source>
 <translation>VDPAU (legjobb)</translation>
 </message>
@@ -2210,7 +2281,7 @@
 </message>
 <message>
 <location line="+49"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -2293,12 +2364,12 @@
 A PSP kompatibilis videóhoz szükséges.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+188"/>
+ <location filename="../../common/gui_main.cpp" line="+189"/>
 <source>Select script to save</source>
 <translation>Mentendő szkript választás</translation>
 </message>
 <message>
- <location line="+164"/>
+ <location line="+168"/>
 <source>Not coded in this version</source>
 <translation>Nem kódolt ebben a verzióban</translation>
 </message>
@@ -2311,12 +2382,41 @@
 <translation type="vanished">AVI fájl kiválasztása hozzáfűzésre...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation>Biztos benne?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation>Hozzáférési hiba</translation>
 </message>
@@ -2412,7 +2512,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation>Valami rossz történt</translation>
 </message>
@@ -2427,7 +2527,7 @@
 <translation>Fő hangsáv</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation>AvsProxy</translation>
 </message>
@@ -2459,7 +2559,7 @@
 <translation>Képkocka Hex Dump</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation>Időbélyeg:</translation>
 </message>
@@ -2484,7 +2584,7 @@
 <translation>Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-376"/>
+ <location filename="../../common/gui_save.cpp" line="-539"/>
 <source>Output file</source>
 <translation>Kimeneti fájl</translation>
 </message>
@@ -2524,6 +2624,11 @@
 <translation>JPEG kiválasztása mentésre</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation>Fájl kiválasztása mentésre</translation>
@@ -2534,49 +2639,45 @@
 <translation>Hang mentése</translation>
 </message>
 <message>
- <location line="+148"/>
+ <location line="+211"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Fail to save as jpeg</source>
- <translation>JPEG mentés sikertelen</translation>
+ <translation type="vanished">JPEG mentés sikertelen</translation>
 </message>
 <message>
- <location line="+31"/>
 <source>Saving as set of jpegs</source>
- <translation>mentés JPEG csoportként</translation>
+ <translation type="vanished">mentés JPEG csoportként</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation>Képkocka nem dekódolható</translation>
+ <translation type="vanished">Képkocka nem dekódolható</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation>Megszakítva.</translation>
+ <translation type="vanished">Megszakítva.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+97"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation>Kész</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation>%d kép mentve.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -2587,12 +2688,11 @@
 <translation>Hiba</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation>Nem lehetett menteni az összes képet.</translation>
+ <translation type="vanished">Nem lehetett menteni az összes képet.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation>BMP művelet sikertelen</translation>
 </message>
@@ -2602,7 +2702,7 @@
 <translation>%s mentése BMP fájlként sikertelen.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation>A %s fájl sikeresen mentve.</translation>
 </message>
@@ -2950,7 +3050,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-172"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2965,17 +3065,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+4"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+80"/>
+ <location line="+78"/>
 <source>LIBVA (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3016,12 +3121,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3031,13 +3137,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-62"/>
 <source>Save current settings as default</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -3071,7 +3177,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3091,7 +3197,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -3112,7 +3218,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3122,7 +3236,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -3153,7 +3267,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Hopp</translation>
 </message>
@@ -3163,12 +3277,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <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="-367"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>No</source>
 <translation type="unfinished">Nem</translation>
 </message>
@@ -3188,7 +3302,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+219"/>
+ <location line="+225"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -3204,7 +3318,42 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+125"/>
+ <location line="+84"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3401,28 +3550,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
- <source>Too short</source>
+ <location line="+165"/>
+ <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 line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
+ <location line="+6"/>
+ <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -3518,7 +3667,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -3546,6 +3695,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -3916,16 +4109,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Kezdet (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Kezdet:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Vég (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Vég:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4051,7 +4244,7 @@
 <translation>59.93 (Filmes NTSC (IVTC))</translation>
 </message>
 <message>
- <location line="+162"/>
+ <location line="+174"/>
 <source>Source Fps:</source>
 <translation>Forrás FPS:</translation>
 </message>
@@ -4081,7 +4274,7 @@
 <translation>Érvénytelen fps</translation>
 </message>
 <message>
- <location line="-150"/>
+ <location line="-161"/>
 <source>Change FPS</source>
 <translation type="unfinished">Fps valtas</translation>
 </message>
@@ -4091,7 +4284,7 @@
 <translation type="unfinished">Az fps valtas gyorsitja/lassítja a filmet.</translation>
 </message>
 <message>
- <location line="+149"/>
+ <location line="+160"/>
 <source>Error</source>
 <translation type="unfinished">Hiba</translation>
 </message>
@@ -4291,13 +4484,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation>kontraszt</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4417,7 +4610,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation>Figyelem, a levágás túl széles ! Szélesség visszáll !</translation>
@@ -4428,6 +4621,11 @@
 </source>
 <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"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -4439,40 +4637,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -4679,59 +4887,114 @@
 <translation>Kódolás...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation>Ffázis:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
 <translation>Videó kodek:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation>Nincs</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation>Ismeretlen</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation>0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation>00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation>0 MB</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation>0 kB/s</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation>Számítógép leállítása befejezés után</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation>Prioritás:</translation>
 </message>
@@ -4766,20 +5029,12 @@
 <translation>Szünet / Megszakít</translation>
 </message>
 <message>
- <location line="-158"/>
+ <location line="-149"/>
 <source>Main</source>
 <translation type="unfinished">Általános</translation>
 </message>
 <message>
- <location line="+48"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="+129"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4788,86 +5043,6 @@
 <source>Advanced</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+53"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -4893,7 +5068,7 @@
 <translation>Kontraszt, fenyero, telitettseg es gamma beallitasa.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4959,6 +5134,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -4991,11 +5171,11 @@
 <translation type="vanished">Átmenet típusa:</translation>
 </message>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="vanished">Kezdet (ms):</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="vanished">Vég (ms):</translation>
 </message>
 <message>
@@ -5007,41 +5187,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished">Elhalvanyodas</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Kezdet (ms):</translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Kezdet:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Vég (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Vég:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished">Eltűnés feketébe</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Ki</translation>
 </message>
@@ -5061,19 +5241,19 @@
 <translation type="unfinished">Fokozatos megjelenítés</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">Átmenet típusa:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Kezdet (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Kezdet:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Vég (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Vég:</translation>
 </message>
 </context>
 <context>
@@ -5588,8 +5768,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -5630,6 +5810,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -5638,6 +5833,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -5651,7 +5851,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5791,6 +6011,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -6533,8 +6811,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation>QT4 verzió használandó</translation>
+ <source>use Qt version</source>
+ <translation>Qt verzió használandó</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -6895,6 +7173,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -6925,18 +7208,18 @@
 <translation type="unfinished">Y</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -7160,12 +7443,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation>MKv mentés</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7175,7 +7458,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7266,7 +7554,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Probléma a SVQ3 fejek olvasásánál</translation>
 </message>
@@ -7278,7 +7566,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished"></translation>
@@ -7294,7 +7582,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished">mp4 mentés</translation>
 </message>
@@ -7304,7 +7592,7 @@
 <translation type="unfinished">PSP mentés</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7314,6 +7602,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -7541,12 +7839,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Hiba</translation>
 </message>
@@ -7624,7 +7922,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Hibás formátumú fejléc</translation>
 </message>
@@ -7637,13 +7935,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7776,7 +8074,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Hiba</translation>
 </message>
@@ -7805,18 +8103,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Hiba</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7841,7 +8139,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7861,7 +8159,7 @@
 <translation type="unfinished">Root jogosultság szükséges a művelet végrehajtásához.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7919,7 +8217,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished">Legutóbbi fájlok</translation>
 </message>
@@ -7929,7 +8227,7 @@
 <translation type="unfinished">Legutóbbi projektek</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7994,7 +8292,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -8005,7 +8303,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8153,7 +8451,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8193,7 +8491,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8229,7 +8527,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation>Nem</translation>
 </message>
@@ -8245,12 +8543,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation>%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8326,7 +8624,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation>%s (%u:%u)</translation>
 </message>
@@ -8456,7 +8754,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation>Mód:</translation>
 </message>
@@ -8471,7 +8769,7 @@
 <translation>FPS ujraepites</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation>Egyéni</translation>
 </message>
@@ -8519,7 +8817,7 @@
 <translation>swsResize</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">A szélesség és magasság nem lehet páratlan szám</translation>
 </message>
@@ -8577,7 +8875,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -8594,8 +8891,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -8620,8 +8915,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8646,8 +8939,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8671,7 +8962,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -8685,7 +8975,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -9063,6 +9369,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>swapuv</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
@@ -9229,6 +9559,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -9242,16 +9590,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Indexelés</translation>
@@ -9273,7 +9621,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation>X11</translation>
 </message>
@@ -9322,6 +9670,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -9355,24 +9724,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpauVideoFilterDeint</name>
 <message>
 <source>Keep Top Field</source>
@@ -9703,7 +10054,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9749,7 +10100,7 @@
 <translation type="unfinished">Átlagos bitsebesség:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -9767,7 +10118,7 @@
 Továbblépjünk?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -10163,7 +10514,7 @@
 </message>
 <message>
 <location line="+20"/>
- <source>10 (Best)</source>
+ <source>11 (Best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -11102,7 +11453,7 @@
 <translation type="unfinished">Egyéni</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Cél bitsebesség:</translation>
 </message>
@@ -11233,12 +11584,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">Törlés</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11418,12 +11769,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -11460,12 +11811,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11763,7 +12114,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_it.ts Changed

@@ -3768,11 +3768,41 @@
 <translation type="obsolete">Potrebbe essere correlato a un vecchio file di indice.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation>Tentativo di aprire %s fallito!</translation>
 </message>
 <message>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>Build Time Map</source>
 <translation type="obsolete">Crea time map</translation>
 </message>
@@ -3852,7 +3882,17 @@
 2) concatenali insieme</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+69"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -3869,7 +3909,7 @@
 Eliminare le informazioni temporali?</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-36"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-69"/>
 <source>Cannot find a demuxer for %s</source>
 <translation>Impossibile trovare un demuxer per %s</translation>
 </message>
@@ -3882,14 +3922,14 @@
 2) concatenali insieme</translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+71"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-18"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4339,11 +4379,11 @@
 <translation type="vanished">L&apos;inizio deve essere prima della fine, ed entrambi minori del numero totale di fotogrammi.</translation>
 </message>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="vanished">Tempo di _inizio (ms):</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="vanished">Tempo di _fine (ms):</translation>
 </message>
 <message>
@@ -5552,7 +5592,7 @@
 <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation>Copia</translation>
@@ -5598,7 +5638,7 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation>...</translation>
 </message>
@@ -5615,12 +5655,12 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="-289"/>
+ <location line="-286"/>
 <source>Time:</source>
 <translation>Tempo:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation>00:00:00.000</translation>
 </message>
@@ -5649,7 +5689,7 @@
 <translation>000000</translation>
 </message>
 <message>
- <location line="-1414"/>
+ <location line="-1417"/>
 <source>&amp;Help</source>
 <translation>A&amp;iuto</translation>
 </message>
@@ -5710,7 +5750,7 @@
 <translation type="obsolete">A&amp;uto</translation>
 </message>
 <message>
- <location line="+1545"/>
+ <location line="+1544"/>
 <source>&amp;Open...</source>
 <translation>&amp;Apri...</translation>
 </message>
@@ -5812,7 +5852,7 @@
 <translation type="obsolete">Salva immagine JPEG</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation>&amp;Carica/esegui progetto...</translation>
 </message>
@@ -6237,12 +6277,12 @@
 <translation>Affiancati ver&amp;ticalmente</translation>
 </message>
 <message>
- <location line="-516"/>
+ <location line="-524"/>
 <source>Frame type:</source>
 <translation>Tipo di fotogramma:</translation>
 </message>
 <message>
- <location line="+504"/>
+ <location line="+512"/>
 <source>&amp;Separate</source>
 <translation>&amp;Separati</translation>
 </message>
@@ -6255,7 +6295,7 @@
 <translation type="obsolete">Ctrl+W</translation>
 </message>
 <message>
- <location line="-1143"/>
+ <location line="-1152"/>
 <source>ms</source>
 <translation>ms</translation>
 </message>
@@ -6264,7 +6304,7 @@
 <translation type="obsolete">Salva selezione in immagini JPEG...</translation>
 </message>
 <message>
- <location line="+763"/>
+ <location line="+764"/>
 <source>A:</source>
 <translation>A:</translation>
 </message>
@@ -6302,7 +6342,7 @@
 <translation type="obsolete">Video CD</translation>
 </message>
 <message>
- <location line="-1375"/>
+ <location line="-1378"/>
 <source>&amp;Toolbars</source>
 <translation>&amp;Barre degli strumenti</translation>
 </message>
@@ -6325,7 +6365,7 @@
 <translation type="vanished">&lt;b&gt;Decoder video&lt;b&gt;</translation>
 </message>
 <message>
- <location line="+152"/>
+ <location line="+154"/>
 <location line="+7"/>
 <source>XXXX</source>
 <translation>XXXX</translation>
@@ -6336,7 +6376,7 @@
 <translation>&lt;b&gt;Output video&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation>&lt;b&gt;Output audio&lt;/b&gt;</translation>
 </message>
@@ -6346,7 +6386,7 @@
 <translation> (0 tracce)</translation>
 </message>
 <message>
- <location line="+196"/>
+ <location line="+212"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
 <translation>&lt;b&gt;Contenitore output&lt;/b&gt;</translation>
 </message>
@@ -6367,7 +6407,7 @@
 <translation type="vanished">Audiometro</translation>
 </message>
 <message>
- <location line="+1037"/>
+ <location line="+1046"/>
 <source>&amp;Codec Options</source>
 <translation>Opzioni &amp;codec</translation>
 </message>
@@ -6377,13 +6417,18 @@
 <translation>Ctrl+Alt+C</translation>
 </message>
 <message>
- <location line="-926"/>
- <location line="+937"/>
+ <location line="-935"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation>&amp;Navigazione</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="-291"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+294"/>
 <source>Ctrl+Alt+N</source>
 <translation>Ctrl+Alt+N</translation>
 </message>
@@ -6413,7 +6458,7 @@
 <translation>Ctrl+Alt+M</translation>
 </message>
 <message>
- <location line="-1650"/>
+ <location line="-1659"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6498,7 +6543,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+178"/>
+ <location line="+179"/>
 <source>Se&amp;lection</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6513,17 +6558,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6927,6 +6967,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -7622,6 +7670,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished">...</translation>
 </message>
@@ -8135,7 +8188,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -8169,7 +8222,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>Bordo _sinistro:</translation>
 </message>
@@ -8240,7 +8293,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8249,14 +8302,13 @@
 <translation type="vanished">Rid_uci nell&apos;area di notifica durante la codifica</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation>_Accetta frequenze audio non standard per DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation>_Crea file OpenDML</translation>
+ <translation type="vanished">_Crea file OpenDML</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -8381,16 +8433,21 @@
 <translation>Prioritizzazione</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation>_Usa etichette alternative per gli MP3 in file .mp4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation>XVideo (migliore)</translation>
@@ -8432,7 +8489,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -8519,10 +8576,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation>Audio</translation>
 </message>
@@ -8536,7 +8593,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -8546,7 +8603,7 @@
 <translation>Threading</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
 <source>Pr&amp;eferences</source>
 <translation>Preferenze</translation>
 </message>
@@ -8556,7 +8613,7 @@
 <translation>Preferenze</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
 <source>Open</source>
 <translation>Apri</translation>
 </message>
@@ -8572,7 +8629,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+125"/>
+ <location filename="../../common/gui_save.cpp" line="+282"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation>Coda</translation>
@@ -8589,11 +8646,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation>Salva come JPEG</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>Chiudi</translation>
 </message>
@@ -8693,12 +8760,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>Filtri</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>Seleziona traccia</translation>
 </message>
@@ -9094,17 +9166,16 @@
 <translation type="vanished">Decodifica video usando VDPAU</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-284"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
 <source>Enable openGl support</source>
 <translation>Attiva supporto OpenGL</translation>
 </message>
 <message>
- <location line="+66"/>
 <source>_Split MPEG files every (MB):</source>
- <translation>_Dividi file MPEG ogni (MB):</translation>
+ <translation type="vanished">_Dividi file MPEG ogni (MB):</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+74"/>
 <source>VDPAU (best)</source>
 <translation>VDPAU (migliore)</translation>
 </message>
@@ -9183,12 +9254,12 @@
 È necessario per creare un video compatibile con PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+188"/>
+ <location filename="../../common/gui_main.cpp" line="+189"/>
 <source>Select script to save</source>
 <translation>Seleziona lo script da salvare</translation>
 </message>
 <message>
- <location line="+164"/>
+ <location line="+168"/>
 <source>Not coded in this version</source>
 <translation>Non incluso in questa versione</translation>
 </message>
@@ -9201,12 +9272,41 @@
 <translation type="vanished">Seleziona il file video da aggiungere...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation>Sei sicuro?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation>Errore di permesso</translation>
 </message>
@@ -9302,7 +9402,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation>C&apos;è stato qualche errore</translation>
 </message>
@@ -9317,7 +9417,7 @@
 <translation>Traccia audio principale</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation>AvsProxy</translation>
 </message>
@@ -9349,7 +9449,7 @@
 <translation>Hex dump fotogramma</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation>Orario:</translation>
 </message>
@@ -9374,7 +9474,7 @@
 <translation>_Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-376"/>
+ <location filename="../../common/gui_save.cpp" line="-539"/>
 <source>Output file</source>
 <translation>File in uscita</translation>
 </message>
@@ -9414,6 +9514,11 @@
 <translation>Seleziona il file JPEG da salvare</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation>Seleziona il file da salvare</translation>
@@ -9424,49 +9529,45 @@
 <translation>Salvataggio audio in corso</translation>
 </message>
 <message>
- <location line="+148"/>
+ <location line="+211"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Fail to save as jpeg</source>
- <translation>Impossibile salvare come jpeg</translation>
+ <translation type="vanished">Impossibile salvare come jpeg</translation>
 </message>
 <message>
- <location line="+31"/>
 <source>Saving as set of jpegs</source>
- <translation>Salvataggio come gruppo di jpeg in corso</translation>
+ <translation type="vanished">Salvataggio come gruppo di jpeg in corso</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation>Impossibile decodificare il fotogramma</translation>
+ <translation type="vanished">Impossibile decodificare il fotogramma</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation>Annullamento in corso.</translation>
+ <translation type="vanished">Annullamento in corso.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+97"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation>Fatto</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation>%d immagini salvate.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -9477,12 +9578,11 @@
 <translation>Errore</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation>Impossibile salvare tutte le immagini.</translation>
+ <translation type="vanished">Impossibile salvare tutte le immagini.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation>Op. BMP fallita</translation>
 </message>
@@ -9492,7 +9592,7 @@
 <translation>Salvataggio di %s come file BMP fallito.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation>Il file %s è stato salvato con successo.</translation>
 </message>
@@ -9615,17 +9715,22 @@
 <translation type="obsolete">Questo script è stato già eseguito con successo.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished">Salvataggio in corso</translation>
 </message>
 <message>
+ <location line="+165"/>
+ <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/ADM_commonUI/DIA_audioFilter.cpp" line="+14"/>
 <source>Mixer</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-91"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-90"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9640,17 +9745,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+4"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+80"/>
+ <location line="+78"/>
 <source>LIBVA (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9691,12 +9801,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9706,13 +9817,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-62"/>
 <source>Save current settings as default</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -9746,7 +9857,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9766,7 +9877,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -9787,7 +9898,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9797,7 +9916,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -9828,7 +9947,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Ops</translation>
 </message>
@@ -9838,12 +9957,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-367"/>
+ <location filename="../../common/gui_save.cpp" line="-530"/>
 <source>No</source>
 <translation type="unfinished">No</translation>
 </message>
@@ -9863,7 +9982,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+219"/>
+ <location line="+225"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -9879,7 +9998,42 @@
 <translation type="unfinished">Salvataggio fallito</translation>
 </message>
 <message>
- <location line="+125"/>
+ <location line="+84"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10276,26 +10430,21 @@
 <translation type="unfinished">Codec sconosciuto</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Errore di memoria</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
 <source>Unknown</source>
@@ -10388,7 +10537,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -10416,6 +10565,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -10805,16 +10998,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Tempo di _inizio (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">Tempo di _inizio:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Tempo di _fine (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">Tempo di _fine:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10937,7 +11130,7 @@
 <context>
 <name>changeFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+207"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+219"/>
 <source>Source Fps:</source>
 <translation>Fps sorgente:</translation>
 </message>
@@ -10962,7 +11155,7 @@
 <translation>Cambiamento fps</translation>
 </message>
 <message>
- <location line="-181"/>
+ <location line="-193"/>
 <source>Custom</source>
 <translation type="unfinished">Personalizzato</translation>
 </message>
@@ -10992,7 +11185,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11002,7 +11195,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+149"/>
+ <location line="+160"/>
 <source>Error</source>
 <translation type="unfinished">Errore</translation>
 </message>
@@ -11171,7 +11364,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Contrasto</translation>
 </message>
@@ -11181,8 +11374,8 @@
 <translation type="unfinished">Regola contrasto, luminosità e colori.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11306,7 +11499,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -11317,6 +11510,11 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -11328,40 +11526,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished">Destra:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished">Alto:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished">Azzera</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished">Basso:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished">Sinistra:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished">Crop automatico</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -11579,40 +11787,32 @@
 <translation>Codifica in corso...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation>Fase:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+208"/>
 <source>Video Codec:</source>
 <translation>Codec video:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation>Nessuno</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation>Sconosciuto</translation>
 </message>
 <message>
- <source>Container:</source>
- <translation type="obsolete">Contenitore:</translation>
- </message>
- <message>
- <source>Audio Codec:</source>
- <translation type="obsolete">Codec audio:</translation>
- </message>
- <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+134"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation>0</translation>
 </message>
@@ -11622,59 +11822,19 @@
 <translation>00:00:00</translation>
 </message>
 <message>
- <source>Elapsed:</source>
- <translation type="obsolete">Tempo trascorso:</translation>
- </message>
- <message>
- <source>Time Remaining:</source>
- <translation type="obsolete">Tempo rimanente:</translation>
- </message>
- <message>
- <source>Frames/sec:</source>
- <translation type="obsolete">Fotogrammi/sec:</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-137"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation>0 MB</translation>
 </message>
 <message>
- <source>Total Size:</source>
- <translation type="obsolete">Dimensione totale:</translation>
- </message>
- <message>
- <source>Audio Size:</source>
- <translation type="obsolete">Dimensione audio:</translation>
- </message>
- <message>
- <source>Video Size:</source>
- <translation type="obsolete">Dimensione video:</translation>
- </message>
- <message>
- <source>Processed Frames:</source>
- <translation type="obsolete">Fotogrammi elaborati:</translation>
- </message>
- <message>
- <source>Total Frames:</source>
- <translation type="obsolete">Fotogrammi totali:</translation>
- </message>
- <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation>0 kB/s</translation>
 </message>
 <message>
- <source>Average Bitrate:</source>
- <translation type="obsolete">Bitrate medio:</translation>
- </message>
- <message>
- <source>Quantiser:</source>
- <translation type="obsolete">Quantizzatore:</translation>
- </message>
- <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation>Arresta il sistema al termine</translation>
 </message>
@@ -11719,133 +11879,67 @@
 <translation>Pausa / Annulla </translation>
 </message>
 <message>
- <location line="+90"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Contenitore:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+87"/>
+ <source>Container:</source>
+ <translation>Contenitore:</translation>
 </message>
 <message>
- <location line="-24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Codec audio:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location line="+236"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Tempo trascorso:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location line="-412"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Tempo rimanente:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location line="+436"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Fotogrammi/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location line="-176"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Dimensione totale:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-21"/>
+ <source>Audio Codec:</source>
+ <translation>Codec audio:</translation>
 </message>
 <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Dimensione audio:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+206"/>
+ <source>Elapsed:</source>
+ <translation>Tempo trascorso:</translation>
 </message>
 <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Dimensione video:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-379"/>
+ <source>Time Remaining:</source>
+ <translation>Tempo rimanente:</translation>
 </message>
 <message>
- <location line="+67"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Fotogrammi elaborati:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+400"/>
+ <source>Frames/sec:</source>
+ <translation>Fotogrammi/sec:</translation>
 </message>
 <message>
- <location line="-20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Bitrate medio:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-158"/>
+ <source>Total Size:</source>
+ <translation>Dimensione totale:</translation>
 </message>
 <message>
- <location line="+30"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantizzatore:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-7"/>
+ <source>Audio Size:</source>
+ <translation>Dimensione audio:</translation>
 </message>
 <message>
- <location line="-238"/>
+ <location line="+28"/>
+ <source>Video Size:</source>
+ <translation>Dimensione video:</translation>
+ </message>
+ <message>
+ <location line="+61"/>
+ <source>Processed Frames:</source>
+ <translation>Fotogrammi elaborati:</translation>
+ </message>
+ <message>
+ <location line="-17"/>
+ <source>Average Bitrate:</source>
+ <translation>Bitrate medio:</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Quantiser:</source>
+ <translation>Quantizzatore:</translation>
+ </message>
+ <message>
+ <location line="-211"/>
 <source>Advanced</source>
 <translation type="unfinished">Avanzate</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11894,7 +11988,7 @@
 <translation type="unfinished">Regola contrasto, luminosità, saturazione e gamma.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11980,15 +12074,20 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
 <message>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="obsolete">Tempo di _inizio (ms):</translation>
 </message>
 <message>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="obsolete">Tempo di _fine (ms):</translation>
 </message>
 <message>
@@ -12031,41 +12130,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished">Dissolvenza</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Tempo di _inizio (ms):</translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">Tempo di _inizio:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Tempo di _fine (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">Tempo di _fine:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished">Dissolvenza verso il nero</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">In uscita</translation>
 </message>
@@ -12085,19 +12184,19 @@
 <translation type="unfinished">Dissolvenza in ingresso</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">Tipo di _dissolvenza:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Tempo di _inizio (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">Tempo di _inizio:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">Tempo di _fine (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">Tempo di _fine:</translation>
 </message>
 </context>
 <context>
@@ -12612,8 +12711,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -12654,6 +12753,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -12662,6 +12776,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -12675,7 +12794,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12815,6 +12954,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -13601,8 +13798,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation>Utilizzare la versione QT4</translation>
+ <source>use Qt version</source>
+ <translation>Utilizzare la versione Qt</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -14154,6 +14351,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -14184,18 +14386,18 @@
 <translation type="unfinished">Y</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -14503,12 +14705,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Salvataggio Mkv in corso</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14518,7 +14720,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14609,7 +14816,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Problema di lettura delle intestazioni SVQ3</translation>
 </message>
@@ -14621,7 +14828,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">Non supportato</translation>
@@ -14637,7 +14844,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Salvataggio mp4 in corso</translation>
 </message>
@@ -14647,7 +14854,7 @@
 <translation type="unfinished">Salvataggio PSP in corso</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14657,6 +14864,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -14891,12 +15108,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Errore</translation>
 </message>
@@ -15008,7 +15225,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Intestazione errata</translation>
 </message>
@@ -15021,13 +15238,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -15285,7 +15502,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Errore</translation>
 </message>
@@ -15314,18 +15531,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Errore</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15350,7 +15567,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15370,7 +15587,7 @@
 <translation type="unfinished">Sono richesti i privilegi di amministratore per eseguire questa operazione.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15428,7 +15645,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished">File recenti</translation>
 </message>
@@ -15438,7 +15655,7 @@
 <translation type="unfinished">Progetti recenti</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15503,7 +15720,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -15514,7 +15731,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16117,7 +16334,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Parziale</translation>
 </message>
@@ -16157,7 +16374,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16193,7 +16410,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">No</translation>
 </message>
@@ -16209,12 +16426,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16290,7 +16507,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished">%s (%u:%u)</translation>
 </message>
@@ -16451,7 +16668,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation>_Modalità:</translation>
 </message>
@@ -16466,7 +16683,7 @@
 <translation>Ricampionamento fps</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation type="unfinished">Personalizzato</translation>
 </message>
@@ -16509,7 +16726,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Larghezza e altezza non possono essere dispari</translation>
 </message>
@@ -16572,7 +16789,6 @@
 <translation type="unfinished">Blocca proporzioni</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -16589,8 +16805,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -16615,8 +16829,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -16641,8 +16853,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -16666,7 +16876,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -16680,7 +16889,23 @@
 <translation type="unfinished">Destinazione:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -17096,6 +17321,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -17293,6 +17542,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -17306,16 +17573,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Indicizzazione</translation>
@@ -17337,7 +17604,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -17386,6 +17653,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -17419,24 +17707,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpauVideoFilter</name>
 <message>
 <source>Width :</source>
@@ -17979,7 +18249,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18025,7 +18295,7 @@
 <translation type="unfinished">Bitrate medio:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -18039,7 +18309,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -18634,8 +18904,8 @@
 </message>
 <message>
 <location line="-928"/>
- <source>10 (Best)</source>
- <translation type="unfinished">10 (migliore)</translation>
+ <source>11 (Best)</source>
+ <translation type="unfinished">11 (migliore)</translation>
 </message>
 <message>
 <location line="+221"/>
@@ -19532,7 +19802,7 @@
 <translation type="unfinished">Personalizzato</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Bitrate finale:</translation>
 </message>
@@ -19659,12 +19929,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">Elimina</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished">Generale</translation>
 </message>
@@ -19844,12 +20114,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished">Quantizzatore</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished">51 (Qualità bassa)</translation>
@@ -19886,12 +20156,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished">fotogrammi</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished">Identificatore set di parametri di sequenza:</translation>
 </message>
@@ -20189,7 +20459,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished">Matrice di quantizzazione</translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts Changed

@@ -2395,7 +2395,7 @@
 <translation type="obsolete">古いインデックスファイルに関係するかもしれません.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">%s を開く試みは失敗しました!</translation>
 </message>
@@ -2456,19 +2456,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -3424,7 +3464,7 @@
 <translation type="obsolete">&lt;b&gt;映像&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">コピー</translation>
@@ -3465,7 +3505,7 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="+647"/>
+ <location line="+648"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -3512,7 +3552,7 @@
 <translation type="unfinished">フレームタイプ:</translation>
 </message>
 <message>
- <location line="-1263"/>
+ <location line="-1266"/>
 <source>&amp;Help</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3572,7 +3612,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3588,7 +3628,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3598,7 +3638,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3614,12 +3654,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3642,12 +3682,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3717,7 +3757,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+82"/>
+ <location line="+83"/>
 <source>?</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3737,22 +3777,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3788,7 +3828,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4130,6 +4170,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -4284,6 +4332,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4362,7 +4415,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -4379,7 +4432,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4446,7 +4499,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4455,14 +4508,13 @@
 <translation type="obsolete">エンコード中シストレーを使う(_U)</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">DVDに標準でない音声周波数を受け付ける(_A)</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">OpenDMLファイルを作成する(_O)</translation>
+ <translation type="obsolete">OpenDMLファイルを作成する(_O)</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -4600,16 +4652,21 @@
 </translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished">.mp4にmp3の代替タグを使う(_U)</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">
@@ -4653,7 +4710,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished">
 </translation>
@@ -4737,10 +4794,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">音声</translation>
 </message>
@@ -4754,7 +4811,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">CPU</translation>
 </message>
@@ -4770,7 +4827,7 @@
 <translation type="unfinished">設定</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+42"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -4783,7 +4840,7 @@
 </message>
 <message>
 <location line="+23"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">フィルタ</translation>
 </message>
@@ -4951,7 +5008,7 @@
 <translation type="unfinished">コーデックエラー</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">このバージョンではコード化されていません</translation>
 </message>
@@ -4964,12 +5021,41 @@
 <translation type="obsolete">追加するAVIファイルの選択...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">本当ですか ?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">パーミッション エラー</translation>
 </message>
@@ -5065,7 +5151,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">何か悪いことが起きました</translation>
 </message>
@@ -5080,7 +5166,7 @@
 <translation type="unfinished">主音声トラック</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">AvsProxy</translation>
 </message>
@@ -5127,7 +5213,7 @@
 <translation type="unfinished">デリング(_D)</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">保存するプロジェクトの選択</translation>
 </message>
@@ -5152,7 +5238,7 @@
 <translation type="unfinished">保存するJPEGの選択</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation type="unfinished">保存するファイルの選択</translation>
 </message>
@@ -5162,39 +5248,36 @@
 <translation type="unfinished">音声保存中</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">JPEGの組を保存中</translation>
+ <translation type="obsolete">JPEGの組を保存中</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">フレームをデコードできません</translation>
+ <translation type="obsolete">フレームをデコードできません</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">中止しています.</translation>
+ <translation type="obsolete">中止しています.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">完了</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">%d 画像を保存.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -5205,12 +5288,11 @@
 <translation type="unfinished">エラー</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">全画像を保存できません</translation>
+ <translation type="obsolete">全画像を保存できません</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP op 失敗</translation>
 </message>
@@ -5220,7 +5302,7 @@
 <translation type="unfinished">%s をBMPファイルとしての保存は失敗しました.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">ファイル %s を無事に保存しました.</translation>
 </message>
@@ -5414,7 +5496,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5504,7 +5586,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5519,27 +5601,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable openGl support</source>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>If you use Hw decoding, it is better to use the matching display driver</source>
+ <location line="+2"/>
+ <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
- <source>_Check for new release</source>
+ <location line="+2"/>
+ <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
- <source>_Split MPEG files every (MB):</source>
+ <location line="+7"/>
+ <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+65"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5595,12 +5677,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5610,7 +5693,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
 <source>Open</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5643,11 +5726,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5744,7 +5837,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5864,8 +5962,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -5942,7 +6040,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5967,7 +6065,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -5988,7 +6086,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5998,7 +6104,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -6029,7 +6135,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">しまった</translation>
 </message>
@@ -6039,12 +6145,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">音声デバイス初期化トラブル</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation type="unfinished">いいえ</translation>
 </message>
@@ -6079,7 +6185,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -6095,17 +6206,47 @@
 <translation type="unfinished">保存に失敗</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6528,28 +6669,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">メモリエラー</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
- <source>Too short</source>
+ <location line="+165"/>
+ <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 line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
+ <location line="+6"/>
+ <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -6645,7 +6786,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -6673,6 +6814,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -7046,16 +7231,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7165,7 +7350,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7175,7 +7360,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7371,7 +7556,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">コントラスト</translation>
 </message>
@@ -7381,8 +7566,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7494,7 +7679,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -7505,51 +7690,66 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished">リセット</translation>
 </message>
 <message>
 <location line="-88"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-38"/>
 <source>Crop</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+64"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -7768,48 +7968,103 @@
 </message>
 <message>
 <location line="+44"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">なし</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">不明</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 MB</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 kB/s</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">終了したらコンピュータをシャットダウンする</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation type="unfinished">優先度:</translation>
 </message>
@@ -7849,113 +8104,25 @@
 <translation type="unfinished">拡張</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+35"/>
 <source>Phase:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="+94"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
+ <location line="+114"/>
 <source>Video Codec:</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -7998,7 +8165,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8073,6 +8240,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -8101,41 +8273,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">アウト</translation>
 </message>
@@ -8155,18 +8327,18 @@
 <translation type="unfinished">フェードイン</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">フェードタイプ(_F):</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -8688,8 +8860,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -8730,6 +8902,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -8738,6 +8925,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -8751,7 +8943,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8891,6 +9103,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -9677,7 +9947,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -10141,6 +10411,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -10171,18 +10446,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -10398,12 +10673,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10413,7 +10688,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10492,7 +10772,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">SVQ3ヘッダ読取に問題</translation>
 </message>
@@ -10504,7 +10784,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">未サポート</translation>
@@ -10520,7 +10800,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10530,7 +10810,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10540,6 +10820,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -10738,12 +11028,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">エラー</translation>
 </message>
@@ -10840,7 +11130,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">誤った形式のヘッダ</translation>
 </message>
@@ -10853,13 +11143,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -11034,7 +11324,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">エラー</translation>
 </message>
@@ -11063,18 +11353,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">エラー</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11099,7 +11389,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11119,7 +11409,7 @@
 <translation type="unfinished">この操作を実行するにはRoot特権が要求される</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11177,7 +11467,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11187,7 +11477,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11252,7 +11542,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -11263,7 +11553,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11412,7 +11702,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">部分適用</translation>
 </message>
@@ -11452,7 +11742,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11488,7 +11778,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">いいえ</translation>
 </message>
@@ -11508,7 +11798,7 @@
 <translation type="unfinished">ステレオ</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11584,18 +11874,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11715,7 +12005,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">モード(_M):</translation>
 </message>
@@ -11725,7 +12015,7 @@
 <translation type="unfinished">新規フレームレート(_N):</translation>
 </message>
 <message>
- <location line="-316"/>
+ <location line="-319"/>
 <source>Custom</source>
 <translation type="unfinished">カスタム</translation>
 </message>
@@ -11765,7 +12055,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+281"/>
+ <location line="+284"/>
 <source>Resample fps</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11773,7 +12063,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <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>
 </message>
@@ -11806,8 +12096,6 @@
 <translation type="unfinished">リサイズ</translation>
 </message>
 <message>
- <location line="+50"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
@@ -11834,8 +12122,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -11860,8 +12146,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -11884,7 +12168,7 @@
 <translation type="unfinished">16:9</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
@@ -11946,7 +12230,7 @@
 </translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -11976,7 +12260,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -11992,7 +12275,6 @@
 </message>
 <message>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+42"/>
@@ -12006,7 +12288,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -12324,6 +12622,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -12513,6 +12835,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -12526,16 +12866,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">インデックス作成中</translation>
@@ -12557,7 +12897,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12606,6 +12946,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -12639,24 +13000,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -12995,7 +13338,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13041,7 +13384,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -13055,7 +13398,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -13281,7 +13624,12 @@
 <translation type="unfinished">31</translation>
 </message>
 <message>
- <location line="+1916"/>
+ <location line="+171"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1745"/>
 <source>Normal</source>
 <translation type="unfinished">普通</translation>
 </message>
@@ -13522,12 +13870,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>10 (Best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14349,7 +14692,7 @@
 <translation type="unfinished">カスタム</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14476,12 +14819,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14661,12 +15004,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -14703,12 +15046,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15006,7 +15349,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts Changed

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko_KR">
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
 <source>Cannot find a demuxer for %s</source>
 <translation>%s용 디먹서를 찾을 수 없습니다</translation>
 </message>
@@ -14,7 +14,37 @@
 <translation>%s 열기 실패!</translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
@@ -23,12 +53,22 @@
 2) 작업한 것들을 함께 연결시키면 됩니다 </translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation>타임스탬프가 유효한지 검사 중..</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -505,7 +545,7 @@
 <translation>최근(&amp;R)</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation>코덱 옵션(&amp;P)</translation>
 </message>
@@ -546,7 +586,7 @@
 <translation>필터</translation>
 </message>
 <message>
- <location line="-112"/>
+ <location line="-128"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation>&lt;b&gt;오디오 출력&lt;/b&gt;</translation>
 </message>
@@ -556,7 +596,7 @@
 <translation> (0 트랙)</translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation>이동(&amp;S):</translation>
 </message>
@@ -572,12 +612,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation>탐색(&amp;N)</translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation>재생 [SPACE]</translation>
 </message>
@@ -600,12 +640,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation>...</translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation>이전 프레임으로 가기 [LEFT]</translation>
 </message>
@@ -675,7 +715,7 @@
 <translation>시간:</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation>00:00:00.000</translation>
 </message>
@@ -726,22 +766,26 @@
 <translation>표시 B로 가기 [PAGE DOWN]</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>Display output video on playback</source>
- <translation>재생시 출력 비디오 표시하기</translation>
+ <translation type="vanished">재생시 출력 비디오 표시하기</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation>처리 후 재생</translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation>볼륨(&amp;M)</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation>오디오 미터(&amp;M)</translation>
 </message>
@@ -777,7 +821,7 @@
 <translation>비디오 저장하기</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation>프로젝트 불러오기/실행(&amp;L)...</translation>
 </message>
@@ -880,6 +924,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>SpiderMonkeyShell</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
@@ -916,6 +968,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation>...</translation>
 </message>
@@ -944,12 +1001,16 @@
 </message>
 <message>
 <location line="+10"/>
+ <source>© 2001 - 2018 Mean</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>© 2001 - 2017 Mean</source>
- <translation>© 2001 - 2017 Mean</translation>
+ <translation type="vanished">© 2001 - 2018 Mean</translation>
 </message>
 <message>
 <source>© 2001 - 2016 Mean</source>
- <translation>© 2001 - 2016 Mean</translation>
+ <translation type="vanished">© 2001 - 2018 Mean</translation>
 </message>
 <message>
 <location line="+19"/>
@@ -970,7 +1031,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation>왼쪽 경계선: </translation>
 </message>
@@ -1030,7 +1091,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+435"/>
+ <location filename="../../common/gui_save.cpp" line="+599"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation>대기열</translation>
@@ -1041,7 +1102,17 @@
 <translation>이미지로 저장</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>닫기</translation>
 </message>
@@ -1129,12 +1200,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation>필터</translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation>트랙 선택</translation>
 </message>
@@ -1186,22 +1262,22 @@
 <message>
 <location line="+6"/>
 <source>Zoom 1:4</source>
- <translation>줌 1:4</translation>
+ <translation>배율 1:4</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Zoom 1:2</source>
- <translation>줌 1:2</translation>
+ <translation>배율 1:2</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Zoom 1:1</source>
- <translation>줌 1:1</translation>
+ <translation>배율 1:1</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Zoom 2:1</source>
- <translation>줌 2:1</translation>
+ <translation>배율 2:1</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
@@ -1247,7 +1323,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="+367"/>
 <source>Stereo</source>
 <translation>스테레오</translation>
 </message>
@@ -1398,7 +1474,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+121"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
 <source>CPU</source>
 <translation>CPU</translation>
 </message>
@@ -1408,7 +1484,7 @@
 <translation>내장 지원</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation>타임스탬프:</translation>
 </message>
@@ -1444,13 +1520,13 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="-163"/>
+ <location filename="../../common/gui_save.cpp" line="-320"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation>오디오</translation>
 </message>
@@ -1547,7 +1623,7 @@
 <translation>물결 현상 제거 (deringing)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>DXVA2로 비디오 디코드 (윈도우)</translation>
 </message>
@@ -1567,12 +1643,17 @@
 <translation>LIBVA로 비디오 디코드 (인텔)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Enable openGl support</source>
 <translation>OpenGL 지원 활성화하기</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation>하드웨어 디코딩시, 일치하는 디스플레이 드라이버 사용</translation>
 </message>
@@ -1582,9 +1663,8 @@
 <translation>DVD에 대해 비표준 오디오 주파수 받아들이기 </translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation>OpenDML 파일 만들기</translation>
+ <translation type="vanished">OpenDML 파일 만들기</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -1714,21 +1794,25 @@
 <translation>우선 순위</translation>
 </message>
 <message>
- <location line="+5"/>
 <source>_Split MPEG files every (MB):</source>
- <translation>MPEG 파일 용량 자르기 (MB):</translation>
+ <translation type="vanished">MPEG 파일 용량 자르기 (MB):</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation>.mp4에서 MP3용 대체 태그 사용하기</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation>최근 읽은 파일의 폴더를 저장용 폴더로 사용하기</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation>XVideo (최상)</translation>
@@ -1791,7 +1875,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -1886,12 +1970,13 @@
 <translation>디스플레이</translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation>HW 가속</translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Threading</source>
 <translation>쓰레딩</translation>
 </message>
@@ -1911,17 +1996,17 @@
 <translation>환경 설정</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-104"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
 <source>Save as BMP</source>
 <translation>BMP로 저장</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
 <source>Save as JPEG</source>
 <translation>JPEG로 저장</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -1940,10 +2025,10 @@
 <message>
 <location line="+16"/>
 <source>Pr&amp;eferences</source>
- <translation>환경 설정(&amp;E)</translation>
+ <translation>환경 설정</translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>&amp;Advanced</source>
 <translation>고급(&amp;A)</translation>
 </message>
@@ -1993,25 +2078,25 @@
 <translation>다음 검정 프레임</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="+1330"/>
+ <location filename="../../common/gui_main.cpp" line="+1407"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
 <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="+71"/>
+ <location filename="../../common/gui_save.cpp" line="+183"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation>오류</translation>
 </message>
 <message>
- <location line="-42"/>
- <location line="+42"/>
+ <location line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation>*모든* 비디오를 삭제할 수는 없습니다</translation>
@@ -2102,7 +2187,7 @@
 <translation>FAAC 코덱이 없습니다! PSP 호환 비디오를 만들 때 필요합니다.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation>실행할 스크립트/프로젝트 선택</translation>
 </message>
@@ -2127,7 +2212,7 @@
 <translation>최근 파일과 프로젝트의 목록을 지우려고 합니다. 이 작업은 복구할 수 없습니다. 진행할까요?</translation>
 </message>
 <message>
- <location line="+97"/>
+ <location line="+101"/>
 <source>Not coded in this version</source>
 <translation>이 버전에 코딩되어 있지 않습니다</translation>
 </message>
@@ -2153,22 +2238,59 @@
 <translation>덧붙일 비디오 파일 선택...</translation>
 </message>
 <message>
- <location line="+159"/>
+ <location line="+114"/>
+ <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"/>
 <source>Are you sure?</source>
 <translation>확실한가요?</translation>
 </message>
 <message>
 <location line="+47"/>
+ <location line="+21"/>
 <source>Cutting</source>
 <translation>잘라내느 중</translation>
 </message>
 <message>
- <location line="+0"/>
+ <location line="-20"/>
+ <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>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+16"/>
 <source>Error while cutting out.</source>
 <translation>잘라내는 중 오류 발생.</translation>
 </message>
 <message>
- <location line="+72"/>
+ <location line="+8"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation>권한 오류</translation>
 </message>
@@ -2264,7 +2386,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation>잘못된 일이 발생했습니다</translation>
 </message>
@@ -2310,7 +2432,7 @@
 <translation>주어진 트릭 인덱스의 언어를 설정할 수 없습니다: 무효한 트랙 인덱스!</translation>
 </message>
 <message>
- <location line="+138"/>
+ <location line="+141"/>
 <source>AvsProxy</source>
 <translation>AvsProxy</translation>
 </message>
@@ -2351,12 +2473,12 @@
 <translation>이 기능이 비활성화되었거나 더 이상 유효하지 않습니다</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation>오디오 장치 초기화 중 문제 발생</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-327"/>
+ <location filename="../../common/gui_save.cpp" line="-445"/>
 <source>No</source>
 <translation>아니오</translation>
 </message>
@@ -2416,6 +2538,11 @@
 <translation>저장할 JPEG 선택</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation>저장할 파일 선택</translation>
@@ -2442,48 +2569,78 @@
 <translation>저장 실패</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation>Jpeg</translation>
 </message>
 <message>
 <location line="+0"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>Fail to save as jpeg</source>
- <translation>JPEG로 저장 실패</translation>
+ <translation type="vanished">JPEG로 저장 실패</translation>
 </message>
 <message>
- <location line="+31"/>
 <source>Saving as set of jpegs</source>
- <translation>JPEG 세트로 저장 중</translation>
+ <translation type="vanished">JPEG 세트로 저장 중</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation>프레임을 디코드할 수 없습니다</translation>
+ <translation type="vanished">프레임을 디코드할 수 없습니다</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation>취소 중.</translation>
+ <translation type="vanished">취소 중.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="-34"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation>완료</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation>%d개의 이미지를 저장했습니다.</translation>
 </message>
 <message>
- <location line="+2"/>
 <source>Could not save all images.</source>
- <translation>전체 이미지를 저장할 수 없습니다.</translation>
+ <translation type="vanished">전체 이미지를 저장할 수 없습니다.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+63"/>
 <source>BMP op failed</source>
 <translation></translation>
 </message>
@@ -2493,7 +2650,7 @@
 <translation>%s를 BMP 파일로 저장에 실패했습니다.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation>%s 파일을 성공적으로 저장했습니다.</translation>
 </message>
@@ -2950,29 +3107,33 @@
 <translation>알 수 없는 코덱</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation>시간 맵 빌드 중</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation>메모리 오류</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation>저장 중</translation>
 </message>
 <message>
- <location line="+142"/>
+ <location line="+165"/>
+ <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 line="+6"/>
 <source>Too short</source>
 <translation>너무 짧음</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>The video has been saved but seems to be incomplete.</source>
- <translation>비디오를 저장했으나 미완성인 듯 싶습니다. </translation>
+ <translation type="vanished">비디오를 저장했으나 미완성인 듯 싶습니다. </translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
@@ -3067,7 +3228,7 @@
 <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -3096,6 +3257,50 @@
 <source>Cannot compile shader</source>
 <translation>쉐이더를 컴파일할 수 없습니다</translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -3464,16 +3669,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation>시작 시간 (ms):</translation>
+ <source>_Start time:</source>
+ <translation>시작 시간:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>끝 시간 (ms):</translation>
+ <source>_End time:</source>
+ <translation>끝 시간:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation>검정색으로 바꾸기</translation>
 </message>
@@ -3575,7 +3780,7 @@
 <translation>59.93 (NTSC)</translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation>FPS 변경</translation>
 </message>
@@ -3585,7 +3790,7 @@
 <translation>마치 FPS를 변경하듯이 비디오 속도를 빠르게/느리게 합니다. 이 필터는 재생시간을 변경합니다.</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation>원본 FPS:</translation>
 </message>
@@ -3779,7 +3984,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation>대비</translation>
 </message>
@@ -3789,8 +3994,8 @@
 <translation>대비, 밝기와 색상을 조정합니다.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation>밝기</translation>
 </message>
@@ -3902,7 +4107,7 @@
 <translation>잘라내기 필터</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation>경고: 너비를 너무 많이 잘라냈습니다! 너비 초기화!</translation>
@@ -3913,6 +4118,11 @@
 </source>
 <translation>경고: 높이를 너무 많이 잘라냈습니다! 높이 초기화!</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -3924,40 +4134,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation>오른쪽:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation>위쪽:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation>초기화</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation>아래쪽:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation>왼쪽:</translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation>자동 잘라내기</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -4166,35 +4386,29 @@
 </message>
 <message>
 <location line="+11"/>
- <location line="+223"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation>알 수 없음</translation>
 </message>
 <message>
- <location line="-206"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-194"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation>없음</translation>
 </message>
 <message>
- <location line="-200"/>
+ <location line="-194"/>
 <source>Phase:</source>
 <translation>페이즈:</translation>
 </message>
 <message>
 <location line="+7"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;남은 시간:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>Time Remaining:</source>
+ <translation>남은 시간:</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
 <source>Shut down computer when finished</source>
 <translation>종료시 컴퓨터 끄기</translation>
 </message>
@@ -4245,142 +4459,82 @@
 </message>
 <message>
 <location line="+53"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;오디오 코덱:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>Audio Codec:</source>
+ <translation>오디오 코덱:</translation>
 </message>
 <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;컨테이너:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation>컨테이너:</translation>
 </message>
 <message>
- <location line="+16"/>
+ <location line="+7"/>
 <source>Video Codec:</source>
 <translation>비디오 코덱</translation>
 </message>
 <message>
 <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;오디오 크기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>Audio Size:</source>
+ <translation>오디오 크기:</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;전체 크기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation>전체 크기:</translation>
 </message>
 <message>
- <location line="+10"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+7"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation>0 MB</translation>
 </message>
 <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;비디오 크기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-7"/>
+ <source>Video Size:</source>
+ <translation>비디오 크기:</translation>
 </message>
 <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;평균 비트레이트:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation>평균 비트레이트:</translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation>0</translation>
 </message>
 <message>
- <location line="-78"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;처리된 프레임:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation>처리된 프레임:</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;양자화기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation>양자화기:</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>0 kB/s</source>
 <translation>0 kB/s</translation>
 </message>
 <message>
 <location line="+41"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;경과:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>Elapsed:</source>
+ <translation>경과:</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation>00:00:00</translation>
 </message>
 <message>
 <location line="+14"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;프레임/초:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>Frames/sec:</source>
+ <translation>프레임/초:</translation>
 </message>
 </context>
 <context>
@@ -4396,7 +4550,7 @@
 <translation>대비, 밝기, 채도와 감마를 조정합니다.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation>초기화</translation>
 </message>
@@ -4462,46 +4616,51 @@
 <source>Faac Configuration</source>
 <translation>FAAC 설정</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation>페이드</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation>점점 사라지게 합니다.</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation>시작 시간 (ms):</translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation>시작 시간:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>끝 시간 (ms):</translation>
+ <source>_End time:</source>
+ <translation>끝 시간:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation>검정색으로 페이드</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation>검정색으로 점점 사라지게/나타나게 합니다.</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation>퇴장 효과</translation>
 </message>
@@ -4521,19 +4680,19 @@
 <translation>점점 나타남</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation>페이드 형식:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation>시작 시간 (ms):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">시작 시간:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation>끝 시간 (ms):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">끝 시간:</translation>
 </message>
 </context>
 <context>
@@ -5048,8 +5207,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation>낮은 품질</translation>
@@ -5090,6 +5249,21 @@
 <translation>낮은 레이턴시 (HQ)</translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -5098,6 +5272,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -5111,7 +5290,27 @@
 <translation>최대 비트레이트 (kbps):</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation>NVENC H.264 설정</translation>
 </message>
@@ -5251,6 +5450,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -5996,8 +6253,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation>QT4 버전 사용</translation>
+ <source>use Qt version</source>
+ <translation>Qt 버전 사용</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -6334,6 +6591,11 @@
 <source>Select Logo Image</source>
 <translation>로고 이미지 선택</translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -6364,19 +6626,23 @@
 <translation>Y</translation>
 </message>
 <message>
- <location line="+20"/>
 <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
- <translation>이미지에 알파 채널(RGB로 된 PNG)이 있다면 알파는 무시될 것입니다</translation>
+ <translation type="vanished">이미지에 알파 채널(RGB로 된 PNG)이 있다면 알파는 무시될 것입니다</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+20"/>
 <source>Alpha</source>
 <translation>알파</translation>
 </message>
 <message>
+ <location line="+20"/>
+ <source>Fade-in/out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
- <translation>로고를 대략적으로 설정하기 위해 이미지에서 클릭할 수 있습니다</translation>
+ <source>You can click in the image to approximately position the logo</source>
+ <translation>로고를 대략 배치하기 위해 이미지에서 클릭할 수 있습니다</translation>
 </message>
 </context>
 <context>
@@ -6568,12 +6834,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation>Mkv 저장 중</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation>출력 너비 강제</translation>
 </message>
@@ -6583,7 +6849,12 @@
 <translation>출력 너비</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation>MKV 먹서</translation>
 </message>
@@ -6627,11 +6898,11 @@
 </message>
 <message>
 <source>Luma _Temporal strength:</source>
- <translation>루마 시간 강도:</translation>
+ <translation type="vanished">루마 시간 강도:</translation>
 </message>
 <message>
 <source>MPlayer denoise3d</source>
- <translation>MPlayer denoise3d</translation>
+ <translation type="vanished">MPlayer denoise3d</translation>
 </message>
 </context>
 <context>
@@ -6668,25 +6939,25 @@
 </message>
 <message>
 <source>MPlayer denoise3d</source>
- <translation>MPlayer denoise3d</translation>
+ <translation type="vanished">MPlayer denoise3d</translation>
 </message>
 </context>
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation>SVQ3 헤더를 읽는 중 문제 발생</translation>
 </message>
 <message>
 <source>No stts table</source>
- <translation>Stts 테이블이 없습니다</translation>
+ <translation type="vanished">Stts 테이블이 없습니다</translation>
 </message>
 </context>
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation>미지원</translation>
@@ -6702,7 +6973,7 @@
 <translation>오디오용으로 AAC, AC3, E-AC3와 MPEG 오디오만 지원합니다</translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation>MP4 저장 중</translation>
 </message>
@@ -6712,7 +6983,7 @@
 <translation>PSP 저장 중</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation>먹싱 형식</translation>
 </message>
@@ -6722,6 +6993,16 @@
 <translation>대체 MP3 태그 사용</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation>MP4 먹서</translation>
@@ -6904,12 +7185,12 @@
 <translation>이전 키프레임으로 이동할 수 없습니다</translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation>탐색</translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation>오류</translation>
 </message>
@@ -6972,7 +7253,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation>잘못된 형식의 헤더</translation>
 </message>
@@ -6985,14 +7266,14 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
- <translation>시작 시간 (ms):</translation>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
+ <translation>시작 시간:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
- <translation>끝 시간 (ms):</translation>
+ <source>_End time:</source>
+ <translation>끝 시간:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7073,7 +7354,7 @@
 <message>
 <location line="+28"/>
 <source>ExtraDataSize:</source>
- <translation>추가날짜크기:</translation>
+ <translation>추가데이터크기:</translation>
 </message>
 <message>
 <location line="+14"/>
@@ -7124,7 +7405,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation>오류</translation>
 </message>
@@ -7154,18 +7435,18 @@
 <translation>오디오 파일 선택</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation>오류</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation>그 파일을 오디오 트랙으로 사용할 수 없습니다</translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation>몇몇 트랙이 중복 사용되었습니다</translation>
 </message>
@@ -7190,7 +7471,7 @@
 <translation>... 오디오 트랙 추가</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation>복사</translation>
 </message>
@@ -7210,7 +7491,7 @@
 <translation>이 동작을 수행하려면 루트 권한이 필요합니다.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation>첫 패스</translation>
 </message>
@@ -7268,7 +7549,7 @@
 <translation>&lt;b&gt;새 버전이 나왔습니다!&lt;/b&gt;&lt;br&gt; 버전 %1&lt;br&gt;%2에 배포.&lt;br&gt;여기에서 다운로드할 수 있습니다&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; 자동 업데이트는 환경 설정에서 끌 수 있습니다.&lt;/small&gt;</translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation>최근 파일</translation>
 </message>
@@ -7278,7 +7559,7 @@
 <translation>최근 프로젝트</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation>재생/정지</translation>
 </message>
@@ -7343,7 +7624,7 @@
 <translation>1분 앞으로</translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
 <translation>프로그램에서 치명적인 문제가 발생했습니다
@@ -7355,7 +7636,7 @@
 <translation>%c-%s (%02d)</translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation> (%d 트랙)</translation>
 </message>
@@ -7503,7 +7784,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation>일부분</translation>
 </message>
@@ -7543,7 +7824,7 @@
 <translation>부분적으로 만들기</translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation>비디오 필터 불러오기..</translation>
 </message>
@@ -7579,7 +7860,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation>아니오</translation>
 </message>
@@ -7595,12 +7876,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation>%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation>비디오</translation>
 </message>
@@ -7676,7 +7957,7 @@
 <translation>오디오 없음</translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation>%s (%u:%u)</translation>
 </message>
@@ -7846,7 +8127,7 @@
 <translation>FPS를 강제로 변경합니다. 재생시간과 싱크를 유지합니다.</translation>
 </message>
 <message>
- <location line="+274"/>
+ <location line="+277"/>
 <source>_Mode:</source>
 <translation>모드:</translation>
 </message>
@@ -7864,7 +8145,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation>너비와 높이는 홀수가 될 수 없습니다</translation>
 </message>
@@ -7927,7 +8208,6 @@
 <translation>화면 비율 잠금</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -7944,8 +8224,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -7970,8 +8248,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -7996,8 +8272,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8021,7 +8295,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -8035,7 +8308,23 @@
 <translation>대상:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -8293,7 +8582,7 @@
 </message>
 <message>
 <source>00:00:00.000</source>
- <translation>00:00:00.000</translation>
+ <translation type="vanished">00:00:00.000</translation>
 </message>
 <message>
 <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
@@ -8332,7 +8621,7 @@
 </message>
 <message>
 <source>A&amp;utoZoom</source>
- <translation>자동 확대/축소</translation>
+ <translation type="vanished">자동 확대/축소</translation>
 </message>
 </context>
 <context>
@@ -8383,6 +8672,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>swapuv</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
@@ -8549,6 +8862,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -8563,16 +8894,16 @@
 idx2 파일을 삭제하고 파일을 다시 여세요.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation>연속적인 파일 이름을 가진 파일이 여럿 있습니다. 전부 불러올까요?</translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation>인덱싱</translation>
@@ -8594,7 +8925,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation>X11</translation>
 </message>
@@ -8643,6 +8974,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -8678,19 +9030,16 @@
 <context>
 <name>vaenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
 <source>Bitrate (kbps):</source>
- <translation>비트레이트 (kbps):</translation>
+ <translation type="vanished">비트레이트 (kbps):</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Max Bitrate (kbps):</source>
- <translation>최대 비트레이트 (kbps):</translation>
+ <translation type="vanished">최대 비트레이트 (kbps):</translation>
 </message>
 <message>
- <location line="+4"/>
 <source>VAAPI H264 Encoder</source>
- <translation>vaapi H264 인코더</translation>
+ <translation type="vanished">vaapi H264 인코더</translation>
 </message>
 </context>
 <context>
@@ -8945,7 +9294,7 @@
 <translation>이 모드는 구현되지 않았습니다</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation>없음</translation>
 </message>
@@ -8991,7 +9340,7 @@
 <translation>평균 비트레이트:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -9009,7 +9358,7 @@
 계속할까요?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -9406,8 +9755,8 @@
 </message>
 <message>
 <location line="+20"/>
- <source>10 (Best)</source>
- <translation>10 (최고)</translation>
+ <source>11 (Best)</source>
+ <translation>11 (최고)</translation>
 </message>
 <message>
 <location line="+78"/>
@@ -10298,7 +10647,7 @@
 <translation>사용자 정의</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation>대상 비트레이트:</translation>
 </message>
@@ -10426,12 +10775,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation>삭제</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation>일반</translation>
 </message>
@@ -10611,12 +10960,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation>양자화기</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation>51 (낮은 품질)</translation>
@@ -10653,12 +11002,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation>프레임</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation>시퀀스 매개변수 세트 식별자: </translation>
 </message>
@@ -10956,7 +11305,12 @@
 <translation>노이즈 리덕션 인터:</translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation>양자화 매트릭스</translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="pl_PL" sourcelanguage="en_US">
 <context>
 <name></name>
 <message>
@@ -3614,9 +3614,9 @@
 <translation type="obsolete">Może być związany ze starym plikiem indeksu.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
- <translation type="unfinished">Nie udało się otworzyć %s!</translation>
+ <translation>Nie udało się otworzyć %s!</translation>
 </message>
 <message>
 <source>Video dimensions don&apos;t match.</source>
@@ -3691,22 +3691,64 @@
 <message>
 <location line="-36"/>
 <source>Cannot find a demuxer for %s</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można znaleźć demuksera dla %s</translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation>szerokość</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation>%swysokość</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation> i </translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation>%sróżne w pierwszym i tym strumieniu obrazu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation> są </translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation> jest </translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
- <translation type="unfinished"></translation>
+ <translation>Nie możesz jeszcze łączyć różnych wymiarów wideo. Korzystanie z częściowego filtra wideo później nie obejdzie tego problemu. Rozwiązaniem jest:
+1) Sprowadzenie wszystkich strumieni do tych samych wymiarów, używając filtra &quot;kadrowanie&quot; / &quot;dodaj obramowanie&quot; lub &quot;zmiana rozmiaru&quot;
+2) połączenie ich razem</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
+ <translation>Sprawdzanie, czy znaczniki czasu są prawidłowe...</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <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>
 <message>
- <location line="+18"/>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation>Dekodowanie wideo...</translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -4062,37 +4104,37 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+16"/>
 <source>Calculator</source>
- <translation type="unfinished">Kalkulator</translation>
+ <translation>Kalkulator</translation>
 </message>
 <message>
 <location line="+40"/>
 <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
+ <translation>00:00:00</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>AVI</source>
- <translation type="unfinished">AVI</translation>
+ <translation>AVI</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>OGM</source>
- <translation type="unfinished">OGM</translation>
+ <translation>OGM</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
+ <translation>MPEG</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Duration:</source>
- <translation type="unfinished">Długość:</translation>
+ <translation>Długość:</translation>
 </message>
 <message>
 <location line="+33"/>
 <source>Custom</source>
- <translation type="unfinished">Własna</translation>
+ <translation>Własna</translation>
 </message>
 <message>
 <location line="+81"/>
@@ -4100,7 +4142,7 @@
 <location line="+27"/>
 <location line="+34"/>
 <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <translation>MB</translation>
 </message>
 <message>
 <location line="-71"/>
@@ -4109,114 +4151,114 @@
 <location line="+68"/>
 <location line="+18"/>
 <source>0</source>
- <translation type="unfinished">0</translation>
+ <translation>0</translation>
 </message>
 <message>
 <location line="-517"/>
 <source>Target</source>
- <translation type="unfinished"></translation>
+ <translation>Cel</translation>
 </message>
 <message>
 <location line="+54"/>
 <source>Medium:</source>
- <translation type="unfinished"></translation>
+ <translation>Nośnik:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Format:</source>
- <translation type="unfinished"></translation>
+ <translation>Format:</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>1 x 80 minute CD</source>
- <translation type="unfinished"></translation>
+ <translation>1 x 80 minut CD</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2 x 80 minute CD</source>
- <translation type="unfinished"></translation>
+ <translation>2 x 80 minut CD</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>1 x 74 minute CD</source>
- <translation type="unfinished"></translation>
+ <translation>1 x 74 minut CD</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2 x 74 minute CD</source>
- <translation type="unfinished"></translation>
+ <translation>2 x 74 minut CD</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>DVD-5</source>
- <translation type="unfinished"></translation>
+ <translation>DVD-5</translation>
 </message>
 <message>
 <location line="+63"/>
 <source>Custom Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Własny rozmiar:</translation>
 </message>
 <message>
 <location line="+65"/>
 <source>Audio Bitrate</source>
- <translation type="unfinished"></translation>
+ <translation>Przepływność dźwięku:</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Track 1:</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka 1:</translation>
 </message>
 <message>
 <location line="+14"/>
 <location line="+37"/>
 <location line="+232"/>
 <source>kbps</source>
- <translation type="unfinished"></translation>
+ <translation>kb/s</translation>
 </message>
 <message>
 <location line="-246"/>
 <source>Track 2:</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka 2:</translation>
 </message>
 <message>
 <location line="+39"/>
 <source>Result</source>
- <translation type="unfinished"></translation>
+ <translation>Wynik</translation>
 </message>
 <message>
 <location line="+28"/>
 <source>Audio Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar audio:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Video Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar wideo:</translation>
 </message>
 <message>
 <location line="+61"/>
 <source>Total Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Całkowity rozmiar:</translation>
 </message>
 <message>
 <location line="+120"/>
 <source>Bits Per Pixel:</source>
- <translation type="unfinished"></translation>
+ <translation>Bitów na piksel:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Video Bitrate:</source>
- <translation type="unfinished"></translation>
+ <translation>Przepływność wideo:</translation>
 </message>
 <message>
 <location line="+61"/>
 <source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>Anuluj</translation>
 </message>
 </context>
 <context>
@@ -4399,17 +4441,17 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
 <source>Indexing</source>
- <translation type="unfinished">Indeksowanie</translation>
+ <translation>Indeksowanie</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Time Left : Infinity</source>
- <translation type="unfinished"></translation>
+ <translation>Pozostały czas : Nieskończony</translation>
 </message>
 <message>
 <location line="+1"/>
 <source># Images :</source>
- <translation type="unfinished"></translation>
+ <translation># Obrazy :</translation>
 </message>
 </context>
 <context>
@@ -4420,7 +4462,7 @@
 <location line="+41"/>
 <location line="+41"/>
 <source>Configure</source>
- <translation type="unfinished">Konfiguruj</translation>
+ <translation>Konfiguruj</translation>
 </message>
 <message>
 <source>Audio Filters</source>
@@ -4432,17 +4474,17 @@
 <location line="+41"/>
 <location line="+41"/>
 <source>Filters</source>
- <translation type="unfinished">Filtry</translation>
+ <translation>Filtry</translation>
 </message>
 <message>
 <location line="-164"/>
 <source>Audio Tracks Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja ścieżek audio</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>Track 1</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka 1</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -4450,22 +4492,22 @@
 <location line="+41"/>
 <location line="+41"/>
 <source>Enabled</source>
- <translation type="unfinished"></translation>
+ <translation>Włączona</translation>
 </message>
 <message>
 <location line="-89"/>
 <source>Track 2</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka 2</translation>
 </message>
 <message>
 <location line="+41"/>
 <source>Track 3</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka 3</translation>
 </message>
 <message>
 <location line="+41"/>
 <source>Track 4</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka 4</translation>
 </message>
 </context>
 <context>
@@ -4478,27 +4520,27 @@
 <message>
 <location line="+7"/>
 <source>Ignore</source>
- <translation type="unfinished">Ignoruj</translation>
+ <translation>Ignoruj</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Ok</source>
- <translation type="unfinished">Ok</translation>
+ <translation>Ok</translation>
 </message>
 <message>
 <location line="+28"/>
 <source>00:00:00/000</source>
- <translation type="unfinished">00:00:00/000</translation>
+ <translation>00:00:00/000</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Timecode:</source>
- <translation type="unfinished">Kod czasu:</translation>
+ <translation>Kod czasu:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>0/0</source>
- <translation type="unfinished">0/0</translation>
+ <translation>0/0</translation>
 </message>
 <message>
 <location line="-103"/>
@@ -4508,17 +4550,17 @@
 <message>
 <location line="+20"/>
 <source>Calibrate</source>
- <translation type="unfinished"></translation>
+ <translation>Kalibruj</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Skip All</source>
- <translation type="unfinished"></translation>
+ <translation>Pomiń wszystko</translation>
 </message>
 <message>
 <location line="+52"/>
 <source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij</translation>
 </message>
 <message>
 <location line="+31"/>
@@ -4531,42 +4573,42 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+47"/>
 <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
+ <translation>00:00:00</translation>
 </message>
 <message>
 <location line="+34"/>
 <source>0</source>
- <translation type="unfinished">0</translation>
+ <translation>0</translation>
 </message>
 <message>
 <location line="-67"/>
 <source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation>Okno dialogowe</translation>
 </message>
 <message>
 <location line="+19"/>
 <source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>Anuluj</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>TimeLeft</source>
- <translation type="unfinished"></translation>
+ <translation>Pozostało</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>ProcessImages</source>
- <translation type="unfinished"></translation>
+ <translation>Przetwarzanie obrazów</translation>
 </message>
 <message>
 <location line="+34"/>
 <source>Speed</source>
- <translation type="unfinished"></translation>
+ <translation>Szybkość</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>0 fps</source>
- <translation type="unfinished"></translation>
+ <translation>0 fps</translation>
 </message>
 </context>
 <context>
@@ -4574,27 +4616,27 @@
 <message>
 <location filename="../ADM_jobs/src/uiProgress.ui" line="+37"/>
 <source>1/1</source>
- <translation type="unfinished">1/1</translation>
+ <translation>1/1</translation>
 </message>
 <message>
 <location line="-20"/>
 <source>Progress</source>
- <translation type="unfinished"></translation>
+ <translation>Postęp</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>Current job</source>
- <translation type="unfinished"></translation>
+ <translation>Aktualne zadanie</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>File being written </source>
- <translation type="unfinished"></translation>
+ <translation>Plik jest zapisywany </translation>
 </message>
 <message>
 <location line="+7"/>
 <source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
 </message>
 </context>
 <context>
@@ -4623,18 +4665,18 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
 <source>_Profile::</source>
- <translation type="unfinished"></translation>
+ <translation>_Profil:</translation>
 </message>
 <message>
 <location line="+1"/>
 <location line="+9"/>
 <source>_Bitrate:</source>
- <translation type="unfinished"></translation>
+ <translation>_Przepływność:</translation>
 </message>
 <message>
 <location line="-7"/>
 <source>SBR enabled</source>
- <translation type="unfinished"></translation>
+ <translation>SBR włączony</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -4646,7 +4688,7 @@
 <location line="-3"/>
 <location line="+5"/>
 <source>FDK-AAC Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja FDK-AAC</translation>
 </message>
 </context>
 <context>
@@ -4867,17 +4909,17 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+15"/>
 <source>Avidemux</source>
- <translation type="unfinished">Avidemux</translation>
+ <translation>Avidemux</translation>
 </message>
 <message>
 <source>&lt;b&gt;Video&lt;/b&gt;</source>
 <translation type="obsolete">&lt;b&gt;Obraz&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
- <translation type="unfinished">Kopiuj</translation>
+ <translation>Kopiuj</translation>
 </message>
 <message>
 <location line="-294"/>
@@ -4885,18 +4927,18 @@
 <location line="+169"/>
 <location line="+181"/>
 <source>Configure</source>
- <translation type="unfinished">Konfiguruj</translation>
+ <translation>Konfiguruj</translation>
 </message>
 <message>
 <location line="-592"/>
 <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;b&gt;Dekoder wideo&lt;/b&gt;</translation>
 </message>
 <message>
 <location line="+258"/>
 <location line="+169"/>
 <source>Filters</source>
- <translation type="unfinished">Filtry</translation>
+ <translation>Filtry</translation>
 </message>
 <message>
 <source>&lt;b&gt;Audio&lt;/b&gt;</source>
@@ -4905,7 +4947,7 @@
 <message>
 <location line="+59"/>
 <source>ms</source>
- <translation type="unfinished">ms</translation>
+ <translation>ms</translation>
 </message>
 <message>
 <source>&lt;b&gt;Format&lt;/b&gt;</source>
@@ -4916,25 +4958,25 @@
 <translation type="obsolete">0</translation>
 </message>
 <message>
- <location line="+588"/>
+ <location line="+589"/>
 <source>00:00:00.000</source>
- <translation type="unfinished">00:00:00.000</translation>
+ <translation>00:00:00.000</translation>
 </message>
 <message>
 <location line="+175"/>
 <source>A:</source>
- <translation type="unfinished">A:</translation>
+ <translation>A:</translation>
 </message>
 <message>
 <location line="+17"/>
 <location line="+10"/>
 <source>000000</source>
- <translation type="unfinished">000000</translation>
+ <translation>000000</translation>
 </message>
 <message>
 <location line="-20"/>
 <source>B:</source>
- <translation type="unfinished">B:</translation>
+ <translation>B:</translation>
 </message>
 <message>
 <source>Decoder Options</source>
@@ -4959,119 +5001,119 @@
 <message>
 <location line="-131"/>
 <source>Frame type:</source>
- <translation type="unfinished">Typ klatki:</translation>
+ <translation>Typ klatki:</translation>
 </message>
 <message>
- <location line="-1263"/>
+ <location line="-1266"/>
 <source>&amp;Help</source>
- <translation type="unfinished"></translation>
+ <translation>Po&amp;moc</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Vi&amp;deo</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Obraz</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;Edit</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Edycja</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;View</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Widok</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>&amp;Toolbars</source>
- <translation type="unfinished"></translation>
+ <translation>Paski &amp;narzędzi</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>&amp;Auto</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;Custom</source>
- <translation type="unfinished"></translation>
+ <translation>Własne</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;Go</source>
- <translation type="unfinished"></translation>
+ <translation>Nawi&amp;gacja</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;Tools</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Narzędzia</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;Audio</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Dźwięk</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;File</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Plik</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;Recent</source>
- <translation type="unfinished"></translation>
+ <translation>Os&amp;tatnie</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia kodeka</translation>
 </message>
 <message>
 <location line="+108"/>
 <location line="+7"/>
 <source>XXXX</source>
- <translation type="unfinished"></translation>
+ <translation>XXXX</translation>
 </message>
 <message>
 <location line="+57"/>
 <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;b&gt;Wyjście wideo&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;b&gt;Wyjście audio&lt;/b&gt;</translation>
 </message>
 <message>
 <location line="+10"/>
 <source> (0 track(s))</source>
- <translation type="unfinished"></translation>
+ <translation> (0 ścieżek)</translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
- <translation type="unfinished"></translation>
+ <translation>Przesunięcie:</translation>
 </message>
 <message>
 <location line="+67"/>
 <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;b&gt;Format wyjściowy&lt;/b&gt;</translation>
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
- <translation type="unfinished"></translation>
+ <translation>Nawigacja</translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
- <translation type="unfinished"></translation>
+ <translation>Odtwórz [SPACJA]</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Play</source>
- <translation type="unfinished"></translation>
+ <translation>Odtwórz</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -5087,242 +5129,246 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia klatka [STRZAŁKA W LEWO]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Go to next frame [RIGHT]</source>
- <translation type="unfinished"></translation>
+ <translation>Następna klatka [STRZAŁKA W PRAWO]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Go to previous keyframe [DOWN]</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia klatka kluczowa [DÓŁ]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Go to next keyframe [UP]</source>
- <translation type="unfinished"></translation>
+ <translation>Następna klatka kluczowa [GÓRA]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Set start marker [CTRL+PAGEUP]</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw znacznik początkowy [CTRL+PAGEUP]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Set end marker [CTRL+PAGEDOWN]</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw znacznik końcowy [CTRL+PAGEDOWN]</translation>
 </message>
 <message>
 <location line="+26"/>
 <source>Search previous black frame</source>
- <translation type="unfinished"></translation>
+ <translation>Wyszukaj poprzednią czarną klatkę</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Search next black frame</source>
- <translation type="unfinished"></translation>
+ <translation>Wyszukaj następną czarną klatkę</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Go to first frame [HOME]</source>
- <translation type="unfinished"></translation>
+ <translation>Pierwsza klatka [HOME]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Go to last frame [END]</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnia klatka [END]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Backward one minute [CTRL+DOWN]</source>
- <translation type="unfinished"></translation>
+ <translation>Do tyłu jedna minuta [CTRL+DÓŁ]</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Forward one minute [CTRL+UP]</source>
- <translation type="unfinished"></translation>
+ <translation>Do przodu jedna minuta [CTRL+GÓRA]</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Forward one minute</source>
- <translation type="unfinished"></translation>
+ <translation>Do przodu jedna minuta</translation>
 </message>
 <message>
 <location line="+58"/>
 <source>Time:</source>
- <translation type="unfinished"></translation>
+ <translation>Czas:</translation>
 </message>
 <message>
- <location line="+40"/>
+ <location line="+41"/>
 <source>/ 00:00:00.000</source>
- <translation type="unfinished"></translation>
+ <translation>/ 00:00:00.000</translation>
 </message>
 <message>
 <location line="+42"/>
 <source>?</source>
- <translation type="unfinished"></translation>
+ <translation>?</translation>
 </message>
 <message>
 <location line="+38"/>
 <source>Se&amp;lection</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczeni&amp;e</translation>
 </message>
 <message>
 <location line="+87"/>
 <source>Go to marker A [PAGE UP]</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do znacznika A [PAGE UP]</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Go to Marker B [PAGE DOWN]</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do znacznika B [PAGE DOWN]</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>Display output video on playback</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Wyświetl wideo wyjściowe przy odtwarzaniu</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
- <translation type="unfinished"></translation>
+ <translation>Odtwórz filtrowane</translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
- <translation type="unfinished"></translation>
+ <translation>Głośność</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
+ <translation>Zaznaczenie: 000000</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
- <translation type="unfinished"></translation>
+ <translation>Miernik poziomu dźwięku</translation>
 </message>
 <message>
 <location line="+41"/>
 <source>&amp;Open...</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Otwórz...</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Open Video</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz wideo</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>&amp;Information...</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Informacje...</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Alt+Return</source>
- <translation type="unfinished"></translation>
+ <translation>Alt+Return</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Save &amp;Video...</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz &amp;wideo</translation>
 </message>
 <message>
 <location line="+3"/>
 <location line="+3"/>
 <source>Save Video</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz wideo</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Wczytaj/Uruchom projekt...</translation>
 </message>
 <message>
 <location line="+3"/>
 <location line="+3"/>
 <source>Load/Run Project</source>
- <translation type="unfinished"></translation>
+ <translation>Wczytaj/Uruchom projekt</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Save &amp;Project</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz &amp;projekt</translation>
 </message>
 <message>
 <location line="+3"/>
 <location line="+3"/>
 <source>Save Project</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz projekt</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>&amp;Calculator...</source>
- <translation type="unfinished"></translation>
+ <translation>Kalkulator...</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>F7</source>
- <translation type="unfinished"></translation>
+ <translation>F7</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>&amp;Input</source>
- <translation type="unfinished"></translation>
+ <translation>Wejście</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>&amp;Output</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjście</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>&amp;Codec Options</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia kodeka</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Ctrl+Alt+C</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Alt+C</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Ctrl+Alt+N</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Alt+N</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>&amp;Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczenie</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Ctrl+Alt+S</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Alt+S</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>&amp;Volume</source>
- <translation type="unfinished"></translation>
+ <translation>Głośność</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Ctrl+Alt+V</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Alt+V</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>&amp;Audio Metre</source>
- <translation type="unfinished"></translation>
+ <translation>Miernik poziomu dźwięku</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Ctrl+Alt+M</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Alt+M</translation>
 </message>
 <message>
 <location line="+12"/>
@@ -5598,6 +5644,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation>_Przepływność:</translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -5609,22 +5663,22 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
 <source>Shell</source>
- <translation type="unfinished"></translation>
+ <translation>Powłoka</translation>
 </message>
 <message>
 <location line="+32"/>
 <source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść</translation>
 </message>
 <message>
 <location line="+40"/>
 <source>Evaluate</source>
- <translation type="unfinished"></translation>
+ <translation>Przelicz</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Ctrl+Return</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Enter</translation>
 </message>
 </context>
 <context>
@@ -5747,22 +5801,27 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui" line="+14"/>
 <source>VapourSynth Proxy</source>
- <translation type="unfinished"></translation>
+ <translation>VapourSynth Proxy</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>Select VS file</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik VS</translation>
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation>Użyj port:</translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
- <translation type="unfinished"></translation>
+ <translation>...</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Run!</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom!</translation>
 </message>
 </context>
 <context>
@@ -5872,81 +5931,85 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+126"/>
 <source>Multi-platform Video Editor</source>
- <translation type="unfinished">Wieloplatformowy edytor wideo</translation>
+ <translation>Wieloplatformowy edytor wideo</translation>
 </message>
 <message>
 <location line="-112"/>
 <source>About Avidemux</source>
- <translation type="unfinished"></translation>
+ <translation>O Avidemux</translation>
 </message>
 <message>
 <location line="+93"/>
 <source>Avidemux </source>
- <translation type="unfinished"></translation>
+ <translation>Avidemux </translation>
 </message>
 <message>
- <location line="+29"/>
 <source>© 2001 - 2017 Mean</source>
+ <translation type="vanished">© 2001 - 2018 Mean</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+19"/>
 <source>http://www.avidemux.org</source>
- <translation type="unfinished"></translation>
+ <translation>http://www.avidemux.org</translation>
 </message>
 <message>
 <location line="+45"/>
 <source>&amp;License</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Licencja</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
 </message>
 </context>
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
- <translation type="unfinished">Obramowanie _lewe:</translation>
+ <translation>Obramowanie _lewe:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Right border:</source>
- <translation type="unfinished">Obramowanie p_rawe:</translation>
+ <translation>Obramowanie p_rawe:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Top border:</source>
- <translation type="unfinished">Obramowanie _górne:</translation>
+ <translation>Obramowanie _górne:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Bottom border:</source>
- <translation type="unfinished">Obramowanie _dolne:</translation>
+ <translation>Obramowanie _dolne:</translation>
 </message>
 <message>
 <location line="+3"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+42"/>
 <source>Add Borders</source>
- <translation type="unfinished">Dodaj krawędzie</translation>
+ <translation>Dodaj obramowanie</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Incorrect parameters</source>
- <translation type="unfinished">Niepoprawne parametry</translation>
+ <translation>Niepoprawne parametry</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>All parameters must be even and within range.</source>
- <translation type="unfinished">Wszystkie parametry muszą być równe i znajdować się w zakresie</translation>
+ <translation>Wszystkie parametry muszą być równe i znajdować się w zakresie</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+1"/>
 <source>Add black borders around the image.</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj czarne obramowanie wokół obrazu.</translation>
 </message>
 </context>
 <context>
@@ -5979,291 +6042,295 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
- <translation type="unfinished"></translation>
+ <translation>Dekoduj wideo używając DXVA2 (windows)</translation>
 </message>
 <message>
 <source>_Use systray while encoding</source>
 <translation type="obsolete">Użyj tacki systemowej podczas kodowania</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
- <translation type="unfinished">_Akceptuj niestandardową częstotliwość dźwięku dla DVD</translation>
+ <translation>_Akceptuj niestandardową częstotliwość dźwięku dla DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">Utwórz pliki _OpenDML</translation>
+ <translation type="vanished">Utwórz pliki _OpenDML</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Revert to saved default output settings on video load</source>
- <translation type="unfinished"></translation>
+ <translation>Przywróć zapisane ustawienia domyślne wyjściowe przy ładowaniu wideo</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Enable alternative keyboard shortcuts</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj alternatywne skróty klawiszowe</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Re_verse UP and DOWN arrow keys for navigation</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróc klawisze strzałek GÓRA i DÓŁ dla nawigacji</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>SIMD</source>
- <translation type="unfinished">SIMD</translation>
+ <translation>SIMD</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Enable all SIMD</source>
- <translation type="unfinished">Włącz obsługę wszystkich instrukcji SIMD procesora</translation>
+ <translation>Włącz obsługę wszystkich instrukcji SIMD procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable MMX</source>
- <translation type="unfinished">Włącz obsługę instrukcji MMX procesora</translation>
+ <translation>Włącz obsługę instrukcji MMX procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable MMXEXT</source>
- <translation type="unfinished">Włącz obsługę instrukcji MMXEXT procesora</translation>
+ <translation>Włącz obsługę instrukcji MMXEXT procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable 3DNOW</source>
- <translation type="unfinished">Włącz obsługę instrukcji 3DNOW procesora</translation>
+ <translation>Włącz obsługę instrukcji 3DNOW procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable 3DNOWEXT</source>
- <translation type="unfinished">Włącz obsługę instrukcji 3DNOWEXT procesora</translation>
+ <translation>Włącz obsługę instrukcji 3DNOWEXT procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable SSE</source>
- <translation type="unfinished">Włącz obsługę instrukcji SSE procesora</translation>
+ <translation>Włącz obsługę instrukcji SSE procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable SSE2</source>
- <translation type="unfinished">Włącz obsługę instrukcji SSE2 procesora</translation>
+ <translation>Włącz obsługę instrukcji SSE2 procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable SSE3</source>
- <translation type="unfinished">Włącz obsługę instrukcji SSE3 procesora</translation>
+ <translation>Włącz obsługę instrukcji SSE3 procesora</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Enable SSSE3</source>
- <translation type="unfinished">Włącz obsługę instrukcji SSSE3 procesora</translation>
+ <translation>Włącz obsługę instrukcji SSSE3 procesora</translation>
 </message>
 <message>
 <location line="+21"/>
 <source>_lavc threads:</source>
- <translation type="unfinished">Wątki _lavc:</translation>
+ <translation>Wątki _lavc:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Multi-threading</source>
- <translation type="unfinished">Wielowątkowość</translation>
+ <translation>Wielowątkowość</translation>
 </message>
 <message>
 <location line="+4"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
 <source>High</source>
- <translation type="unfinished">Wysoki</translation>
+ <translation>Wysoki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Above normal</source>
- <translation type="unfinished">Powyżej standardowej</translation>
+ <translation>Powyżej normalnego</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Normal</source>
- <translation type="unfinished">Zwykły</translation>
+ <translation>Normalny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Below normal</source>
- <translation type="unfinished">Poniżej standardowej</translation>
+ <translation>Poniżej normalnego</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
 <source>Low</source>
- <translation type="unfinished">Niski</translation>
+ <translation>Niski</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Encoding priority:</source>
- <translation type="unfinished">Prioryt_et kodowania:</translation>
+ <translation>Prioryt_et kodowania:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Indexing/unpacking priority:</source>
- <translation type="unfinished">Priorytet _indeksowania/rozpakowywania:</translation>
+ <translation>Priorytet _indeksowania/rozpakowywania:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Playback priority:</source>
- <translation type="unfinished">_Priorytet odtwarzania:</translation>
+ <translation>_Priorytet odtwarzania:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Prioritisation</source>
- <translation type="unfinished">Priorytetyzacja</translation>
+ <translation>Priorytetyzacja</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
+ <translation>_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
+ <translation>Domyślnie do zapisu użyj katalog, z którego wczytano ostatni plik</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
- <translation type="unfinished">XVideo (najlepszy)</translation>
+ <translation>XVideo (najlepszy)</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>DXVA2 (best)</source>
- <translation type="unfinished"></translation>
+ <translation>DXVA2 (najlepsze)</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>SDL (good)</source>
- <translation type="unfinished">SDL (dobry)</translation>
+ <translation>SDL (dobry)</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Video _display:</source>
- <translation type="unfinished">Wyświetlanie _obrazu:</translation>
+ <translation>Wyświetlanie _obrazu:</translation>
 </message>
 <message>
 <location line="+29"/>
 <source>No alerts</source>
- <translation type="unfinished">Bez komunikatów</translation>
+ <translation>Bez komunikatów</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Display only error alerts</source>
- <translation type="unfinished">Wyświetlaj tylko komunikaty błędów</translation>
+ <translation>Wyświetlaj tylko komunikaty błędów</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Display all alerts</source>
- <translation type="unfinished">Wyświetlaj wszystkie komunikaty</translation>
+ <translation>Wyświetlaj wszystkie komunikaty</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Message level:</source>
- <translation type="unfinished">Pozio_m komunikatów:</translation>
+ <translation>Pozio_m komunikatów:</translation>
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
- <translation type="unfinished">PCM</translation>
+ <translation>PCM</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Master</source>
- <translation type="unfinished">Główny</translation>
+ <translation>Główny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Volume control:</source>
- <translation type="unfinished">_Kontrola głośności:</translation>
+ <translation>_Kontrola głośności:</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>No downmixing</source>
- <translation type="unfinished">Bez redukcji kanałów</translation>
+ <translation>Bez redukcji kanałów</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+48"/>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
 <source>Stereo</source>
- <translation type="unfinished">Stereo</translation>
+ <translation>Stereo</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
 <source>Pro Logic</source>
- <translation type="unfinished">Pro Logic</translation>
+ <translation>Pro Logic</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Pro Logic II</source>
- <translation type="unfinished">Pro Logic II</translation>
+ <translation>Pro Logic II</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Local playback downmixing:</source>
- <translation type="unfinished">Redukcja kanałów dla odtwarzania _lokalnego:</translation>
+ <translation>Redukcja kanałów dla odtwarzania _lokalnego:</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>_AudioDevice</source>
- <translation type="unfinished">_Urządzenie dźwięku</translation>
+ <translation>_Urządzenie dźwięku</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+38"/>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
 <source>_Horizontal deblocking</source>
- <translation type="unfinished">Rozblokowanie _poziome</translation>
+ <translation>Rozblokowanie _poziome</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
 <source>_Vertical deblocking</source>
- <translation type="unfinished">Rozblokowanie pi_onowe</translation>
+ <translation>Rozblokowanie pi_onowe</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
 <source>De_ringing</source>
- <translation type="unfinished">Usuwanie pie_rścienia</translation>
+ <translation>Deringing</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Strength:</source>
- <translation type="unfinished">_Natężenie</translation>
+ <translation>_Natężenie:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Default Postprocessing</source>
- <translation type="unfinished">Przetwarzanie domyślne</translation>
+ <translation>Przetwarzanie domyślne</translation>
 </message>
 <message>
 <location line="+45"/>
 <source>User Interface</source>
- <translation type="unfinished">Interfejs użytkownika</translation>
+ <translation>Interfejs użytkownika</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Output</source>
- <translation type="unfinished">Wyjscie</translation>
+ <translation>Wyjście</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+80"/>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
- <translation type="unfinished">Dźwięk</translation>
+ <translation>Dźwięk</translation>
 </message>
 <message>
 <location filename="../../common/gui_savenew.cpp" line="-73"/>
@@ -6271,259 +6338,259 @@
 <location line="+16"/>
 <location line="+8"/>
 <source>Video</source>
- <translation type="unfinished">Obraz</translation>
+ <translation>Obraz</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
- <translation type="unfinished">Procesor</translation>
+ <translation>Procesor</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
 <source>Threading</source>
- <translation type="unfinished">Wątkowanie</translation>
+ <translation>Wątkowanie</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
 <source>Pr&amp;eferences</source>
- <translation type="unfinished">Preferencje</translation>
+ <translation>Preferencje</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
 <source>Preferences</source>
- <translation type="unfinished">Preferencje</translation>
+ <translation>Preferencje</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-38"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Copy</source>
- <translation type="unfinished">Kopiuj</translation>
+ <translation>Kopiuj</translation>
 </message>
 <message>
 <location line="+3"/>
 <location line="+2"/>
 <source>Delete</source>
- <translation type="unfinished">Usuń</translation>
+ <translation>Usuń</translation>
 </message>
 <message>
 <location line="+18"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
- <translation type="unfinished">Filtry</translation>
+ <translation>Filtry</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
 <source>R_esampling (Hz):</source>
- <translation type="unfinished">Zmiana częstotliwości próbkowania (Hz)</translation>
+ <translation>Resampling (Hz):</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Resampling frequency (Hz)</source>
- <translation type="unfinished">Zmiana częstotliwości próbkowania (Hz)</translation>
+ <translation>Częstotliwość resamplingu (Hz)</translation>
 </message>
 <message>
 <location line="+4"/>
 <location line="+25"/>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="-24"/>
 <source>Film to PAL</source>
- <translation type="unfinished">Film na PAL</translation>
+ <translation>Film na PAL</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>PAL to Film</source>
- <translation type="unfinished">PAL na Film</translation>
+ <translation>PAL na Film</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>_Frame rate change:</source>
- <translation type="unfinished">Zmiana liczby _klatek na sekundę:</translation>
+ <translation>Zmiana liczby _klatek na sekundę:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>No change</source>
- <translation type="unfinished">Bez zmian</translation>
+ <translation>Bez zmian</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Mono</source>
- <translation type="unfinished">Mono</translation>
+ <translation>Mono</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Stereo+surround</source>
- <translation type="unfinished">Stereo+przestrzenny</translation>
+ <translation>Stereo+przestrzenny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Stereo+center</source>
- <translation type="unfinished">Stereo+centralny</translation>
+ <translation>Stereo+centralny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Stereo+center+surround</source>
- <translation type="unfinished">Stereo+centralny+przestrzenny</translation>
+ <translation>Stereo+centralny+przestrzenny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Stereo front+stereo rear</source>
- <translation type="unfinished">Stereo przednie+stereo tylne</translation>
+ <translation>Stereo przednie+stereo tylne</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>5 channels</source>
- <translation type="unfinished">5 kanałów</translation>
+ <translation>5 kanałów</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>5.1</source>
- <translation type="unfinished">5.1</translation>
+ <translation>5.1</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Dolby Pro Logic</source>
- <translation type="unfinished">Dolby Pro Logic</translation>
+ <translation>Dolby Pro Logic</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Dolby Pro Logic II</source>
- <translation type="unfinished">Dolby Pro Logic II</translation>
+ <translation>Dolby Pro Logic II</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Automatic (max -3 dB)</source>
- <translation type="unfinished">Automatyczny (maks. -3 dB)</translation>
+ <translation>Automatycznie (maks. -3 dB)</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>_Gain mode:</source>
- <translation type="unfinished">Tryb normalizacji _głośności</translation>
+ <translation>Tryb wzmocnienia:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>G_ain value:</source>
- <translation type="unfinished">W_artość normalizacji głośności:</translation>
+ <translation>W_artość wzmocnienia:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>_Mixer:</source>
- <translation type="unfinished">_Mikser dźwięku:</translation>
+ <translation>_Mikser dźwięku:</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>Audio Filters</source>
- <translation type="unfinished">Filtry dźwięku</translation>
+ <translation>Filtry dźwięku</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-16"/>
 <source>Fontconfig</source>
- <translation type="unfinished">Konfiguracja czcionki</translation>
+ <translation>Konfiguracja czcionki</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Gettext</source>
- <translation type="unfinished">Gettext</translation>
+ <translation>Gettext</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>SDL</source>
- <translation type="unfinished">SDL</translation>
+ <translation>SDL</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>XVideo</source>
- <translation type="unfinished">XVideo</translation>
+ <translation>XVideo</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>x86</source>
- <translation type="unfinished">x86</translation>
+ <translation>x86</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>x86-64</source>
- <translation type="unfinished">x86-64</translation>
+ <translation>x86-64</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Libraries</source>
- <translation type="unfinished">Biblioteki</translation>
+ <translation>Biblioteki</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Built-in Support</source>
- <translation type="unfinished">Wbudowane wsparcie</translation>
+ <translation>Wbudowane wsparcie</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
 <source>_Job name:</source>
- <translation type="unfinished">Nazwa _zadania:</translation>
+ <translation>Nazwa _zadania:</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Output _File:</source>
- <translation type="unfinished">_Plik wyjściowy:</translation>
+ <translation>_Plik wyjściowy:</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Select Video To Write</source>
- <translation type="unfinished">Wybierz obraz wideo do zapisu</translation>
+ <translation>Wybierz wideo do zapisu</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Save Job</source>
- <translation type="unfinished">Zapisz zadanie</translation>
+ <translation>Zapisz zadanie</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-23"/>
 <source>Audio Plugins</source>
- <translation type="unfinished">Wtyczki dźwięku</translation>
+ <translation>Wtyczki dźwięku</translation>
 </message>
 <message>
 <location line="+29"/>
 <source>Video Encoder Plugins</source>
- <translation type="unfinished">Wtyczki koderów obrazu</translation>
+ <translation>Wtyczki koderów obrazu</translation>
 </message>
 <message>
 <location line="+24"/>
 <source>Video Encoder</source>
- <translation type="unfinished">Koder obrazu</translation>
+ <translation>Koder obrazu</translation>
 </message>
 <message>
 <location line="+34"/>
 <source>Audio Device Plugins</source>
- <translation type="unfinished">Wtyczki urządzenia dźwiękowego</translation>
+ <translation>Wtyczki urządzenia dźwiękowego</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Audio Device</source>
- <translation type="unfinished">Urządzenie dźwiękowe</translation>
+ <translation>Urządzenie dźwiękowe</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Audio Encoder Plugins</source>
- <translation type="unfinished">Wtyczki koderów dźwięku</translation>
+ <translation>Wtyczki koderów dźwięku</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Audio Encoders</source>
- <translation type="unfinished">Kodery dźwięku</translation>
+ <translation>Kodery dźwięku</translation>
 </message>
 <message>
 <location line="+64"/>
 <source>Plugins Info</source>
- <translation type="unfinished">Informacje o wtyczkach</translation>
+ <translation>Informacje o wtyczkach</translation>
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="+64"/>
@@ -6534,12 +6601,12 @@
 <location line="+27"/>
 <location line="+35"/>
 <source>Codec Error</source>
- <translation type="unfinished">Błąd kodeka</translation>
+ <translation>Błąd kodeka</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
- <translation type="unfinished">Nie zaimplementowane w tej wersji</translation>
+ <translation>Nie zaimplementowane w tej wersji</translation>
 </message>
 <message>
 <source>Select AVI File...</source>
@@ -6550,34 +6617,67 @@
 <translation type="obsolete">Wybierz plik AVI aby dołączyć...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
- <translation type="unfinished">Na pewno?</translation>
+ <translation>Na pewno?</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>Nie można wyciąć całego wideo. Proszę sprawdzić pozycję znaczników A i B.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <translation>Usuwanie</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>It is impossible to delete the entire video. Please recheck the position of markers A and B.</source>
+ <translation>Nie można usunąć całego wideo. Proszę sprawdzić pozycję znaczników A i B.</translation>
 </message>
 <message>
- <location line="+119"/>
+ <location line="+24"/>
+ <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>Punkt końcowy wycięcia nie znajduje się na klatce kluczowej.
+Wideo zapisane w trybie kopiowania będzie uszkodzone w tym miejscu.
+Czy kontynuować mimo to?</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <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>Punkt końcowy usunięcia nie znajduje się na klatce kluczowej.
+Wideo zapisane w trybie kopiowania będzie uszkodzone w tym miejscu.
+Czy kontynuować mimo to?</translation>
+ </message>
+ <message>
+ <location line="+100"/>
 <source>Permission error</source>
- <translation type="unfinished">Błąd: Brak uprawnień</translation>
+ <translation>Błąd: Brak uprawnień</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Cannot open &quot;%s&quot;.</source>
- <translation type="unfinished">Nie można otworzyć &quot;%s&quot;.</translation>
+ <translation>Nie można otworzyć &quot;%s&quot;.</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>File error</source>
- <translation type="unfinished">Błąd podczas otwierania pliku</translation>
+ <translation>Błąd podczas otwierania pliku</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>&quot;%s&quot; does not exist.</source>
- <translation type="unfinished">&quot;%s&quot; nie istnieje.</translation>
+ <translation>&quot;%s&quot; nie istnieje.</translation>
 </message>
 <message>
 <location line="+49"/>
 <source>Cannot open project using the video loader.</source>
- <translation type="unfinished">Nie można otworzyć projektu przy użyciu modułu wczytującego obraz wideo.</translation>
+ <translation>Nie można otworzyć projektu przy użyciu modułu wczytującego obraz wideo.</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -6587,205 +6687,203 @@
 <message>
 <location line="+4"/>
 <source>Could not open the file</source>
- <translation type="unfinished">Nie można otworzyć pliku</translation>
+ <translation>Nie można otworzyć pliku</translation>
 </message>
 <message>
 <location line="+42"/>
 <source>Multiple Audio Tracks</source>
- <translation type="unfinished">Wiele ścieżek dźwięku</translation>
+ <translation>Wiele ścieżek dźwięku</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
- <translation type="unfinished">Wczytany plik zawiera więcej ścieżek dźwięku.
-Przejdź do Dźwięk-&gt;Główna ścieżka aby wybrać aktywną ścieżkę.</translation>
+ <translation>Wczytany plik zawiera wiele ścieżek dźwięku.
+Przejdź do Dźwięk-&gt;Główna ścieżka, aby wybrać aktywną ścieżkę.</translation>
 </message>
 <message>
 <location line="+105"/>
 <source>Something failed when appending</source>
- <translation type="unfinished">Dołączanie się nie powiodło</translation>
+ <translation>Dołączanie się nie powiodło</translation>
 </message>
 <message>
 <location line="+5"/>
 <location line="+268"/>
 <source>Something bad happened (II)</source>
- <translation type="unfinished">Stało się coś złego (II)</translation>
+ <translation>Stało się coś złego (II)</translation>
 </message>
 <message>
 <location line="-151"/>
 <location line="+43"/>
 <source>The tinypy plugin is missing.
 Expect problems.</source>
- <translation type="unfinished"></translation>
+ <translation>Brakuje wtyczki tinypy.
+Spodziewaj się problemów.</translation>
 </message>
 <message>
 <location line="+52"/>
 <source>Checking video</source>
- <translation type="unfinished">Sprawdzanie obrazu wideo</translation>
+ <translation>Sprawdzanie wideo</translation>
 </message>
 <message>
 <location line="+16"/>
 <source>No error found</source>
- <translation type="unfinished">Nie znaleziono błędu</translation>
+ <translation>Nie znaleziono błędu</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Errors found in %u frames</source>
- <translation type="unfinished">Znaleziono błędy w %u klatkach</translation>
+ <translation>Znaleziono błędy w %u klatkach</translation>
 </message>
 <message>
 <location line="+16"/>
 <source>Marker A &gt; B</source>
- <translation type="unfinished">Znacznik A &gt; B</translation>
+ <translation>Znacznik A &gt; B</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Cannot delete the selection.</source>
- <translation type="unfinished">Nie można usunąć zaznaczenia.</translation>
+ <translation>Nie można usunąć zaznaczenia.</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>You can&apos;t remove all frames</source>
- <translation type="unfinished">Nie możesz usunąć wszystkich klatek.</translation>
+ <translation>Nie możesz usunąć wszystkich klatek.</translation>
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
- <translation type="unfinished">Stało się coś złego</translation>
+ <translation>Stało się coś złego</translation>
 </message>
 <message>
 <location line="+88"/>
 <source>_Track from video:</source>
- <translation type="unfinished">Ścieżka z _obrazu wideo:</translation>
+ <translation>Ścieżka z wideo:</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Main Audio Track</source>
- <translation type="unfinished">Główna ścieżka dźwiękowa</translation>
+ <translation>Główna ścieżka dźwiękowa</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
- <translation type="unfinished">AvsProxy</translation>
+ <translation>AvsProxy</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Failed to connect to avsproxy.
 Is it running ?</source>
- <translation type="unfinished">Nie udało się połączyć z avsproxy.
+ <translation>Nie udało się połączyć z avsproxy.
 Czy jest on uruchomiony?</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>avsproxy</source>
- <translation type="unfinished">avsproxy</translation>
+ <translation>avsproxy</translation>
 </message>
 <message>
 <location line="+34"/>
 <source>Frame type:</source>
- <translation type="unfinished">Typ klatki:</translation>
+ <translation>Typ klatki:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Frame size:</source>
- <translation type="unfinished">Rozmiar klatki:</translation>
+ <translation>Rozmiar klatki:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Frame Hex Dump</source>
- <translation type="unfinished">Zrzut szesnastkowy klatki</translation>
+ <translation>Zrzut szesnastkowy klatki</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+34"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
 <source>Go to Time</source>
- <translation type="unfinished">Przejdź do czasu</translation>
+ <translation>Przejdź do czasu</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-12"/>
 <source>_Filter strength:</source>
- <translation type="unfinished">Natężenie _filtra:</translation>
+ <translation>Natężenie _filtra:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Swap U and V</source>
- <translation type="unfinished">_Zamień U i V</translation>
+ <translation>_Zamień U i V</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>_Deringing</source>
- <translation type="unfinished">Usuwanie pie_rścienia</translation>
+ <translation>Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Wybierz narzędzia do zapisania</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Select File to Save Audio</source>
- <translation type="unfinished">Wybierz plik aby zapisać dźwięk</translation>
+ <translation>Wybierz plik aby zapisać dźwięk</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Select JPEG Sequence to Save</source>
- <translation type="unfinished">Wybierz kolejność JPEG do zapisania</translation>
+ <translation>Wybierz sekwencję JPEG do zapisania</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Select BMP to Save</source>
- <translation type="unfinished">Wybierz plik BMP do zapisu</translation>
+ <translation>Wybierz plik BMP do zapisu</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Select JPEG to Save</source>
- <translation type="unfinished">Wybierz plik JPEG do zapisu</translation>
+ <translation>Wybierz plik JPEG do zapisu</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
- <translation type="unfinished">Wybiez plik do zapisu</translation>
+ <translation>Wybiez plik do zapisu</translation>
 </message>
 <message>
 <location line="+62"/>
 <source>Saving audio</source>
- <translation type="unfinished">Zapisywanie dźwięku</translation>
+ <translation>Zapisywanie dźwięku</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Zapisywanie w postaci zestawu plików jpeg</translation>
+ <translation type="vanished">Zapisywanie w postaci zestawu plików jpeg</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">Nie można dekodować klatki</translation>
+ <translation type="vanished">Nie można zdekodować klatki</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">Przerywanie.</translation>
+ <translation type="vanished">Przerywanie.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
- <translation type="unfinished">Zrobione</translation>
+ <translation>Zrobione</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
- <translation type="unfinished">Zapisano %d obrazów.</translation>
+ <translation>Zapisano %d obrazów.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -6793,42 +6891,41 @@
 <location filename="../../common/gui_save.cpp" line="+2"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">Nie można było zapisać wszystkich obrazów</translation>
+ <translation type="vanished">Nie można było zapisać wszystkich obrazów.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
- <translation type="unfinished">Nie udało się otworzyć pliku BMP</translation>
+ <translation>Nie udało się otworzyć pliku BMP</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Saving %s as a BMP file failed.</source>
- <translation type="unfinished">Zapisywanie %s jako pliku BMP nie powiodło się</translation>
+ <translation>Zapisywanie %s jako plik BMP nie powiodło się.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
- <translation type="unfinished">Plik %s został pomyślnie zapisany</translation>
+ <translation>Plik %s został pomyślnie zapisany.</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Failed</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>File %s was NOT saved correctly.</source>
- <translation type="unfinished">Plik %s NIE został prawidłowo zapisany.</translation>
+ <translation>Plik %s NIE został prawidłowo zapisany.</translation>
 </message>
 <message>
 <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+47"/>
 <source>Custom</source>
- <translation type="unfinished">Własna</translation>
+ <translation>Własna</translation>
 </message>
 <message>
 <source>_Mode:</source>
@@ -6893,7 +6990,7 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+3"/>
 <source>Medium</source>
- <translation type="unfinished">Średni</translation>
+ <translation>Średni</translation>
 </message>
 <message>
 <source>VBR</source>
@@ -6966,22 +7063,27 @@
 <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-22"/>
 <source>Gain</source>
- <translation type="unfinished">Normalizacja głośności</translation>
+ <translation>Wzmocnienie</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
- <translation type="unfinished">Zapisywanie</translation>
+ <translation>Zapisywanie</translation>
+ </message>
+ <message>
+ <location line="+165"/>
+ <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>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
 <source>DRC</source>
- <translation type="unfinished"></translation>
+ <translation>DRC</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Manual (dB)</source>
- <translation type="unfinished"></translation>
+ <translation>Ręcznie (dB)</translation>
 </message>
 <message>
 <location line="+13"/>
@@ -6991,657 +7093,734 @@
 <message>
 <location line="+3"/>
 <source>Mixer</source>
- <translation type="unfinished"></translation>
+ <translation>Mikser</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Shift audio:</source>
- <translation type="unfinished"></translation>
+ <translation>Przesuń dźwięk:</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Shift Value (ms):</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość przesunięcia (ms):</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-19"/>
 <source>FreeType 2</source>
- <translation type="unfinished"></translation>
+ <translation>FreeType 2</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>VDPAU</source>
- <translation type="unfinished"></translation>
+ <translation>VDPAU</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="-3"/>
 <source>TimeStamp:</source>
- <translation type="unfinished"></translation>
+ <translation>Znacznik czasu:</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-144"/>
 <source>Video Decoder Plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczki dekodera wideo</translation>
 </message>
 <message>
 <location line="+24"/>
 <source>Video Decoder</source>
- <translation type="unfinished"></translation>
+ <translation>Dekoder wideo</translation>
 </message>
 <message>
 <location line="+63"/>
 <source>Demuxer Plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczki demultipleksera</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Demuxers</source>
- <translation type="unfinished"></translation>
+ <translation>Demultipleksery</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Muxer Plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczki multipleksera</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Muxers</source>
- <translation type="unfinished"></translation>
+ <translation>Multipleksery</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
- <translation type="unfinished"></translation>
+ <translation>Dekoduj wideo używając VDPAU (NVIDIA)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Decode video using XVBA (AMD)</source>
- <translation type="unfinished"></translation>
+ <translation>Dekoduj wideo używając XVBA (AMD)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Decode video using LIBVA (INTEL)</source>
- <translation type="unfinished"></translation>
+ <translation>Dekoduj wideo używając LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation>Dekoduj wideo używając VideoToolbox (macOS)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Enable openGl support</source>
- <translation type="unfinished"></translation>
+ <translation>Włącz obsługę OpenGL</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
- <translation type="unfinished"></translation>
+ <translation>Jeśli używasz dekodowania sprzętowego, lepiej jest używać zgodny sterownik graficzny</translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
- <translation type="unfinished"></translation>
+ <translation>Sprawdź czy jest nowe wydanie</translation>
 </message>
 <message>
- <location line="+55"/>
 <source>_Split MPEG files every (MB):</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Dziel plik MPEG co każde (MB):</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+65"/>
 <source>VDPAU (best)</source>
- <translation type="unfinished"></translation>
+ <translation>VDPAU (najlepsze)</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>OpenGL (best)</source>
- <translation type="unfinished"></translation>
+ <translation>OpenGL (najlepsze)</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>LIBVA (best)</source>
- <translation type="unfinished"></translation>
+ <translation>LIBVA (najlepsze)</translation>
 </message>
 <message>
 <location line="+28"/>
 <location line="+3"/>
 <source>Sdl driver</source>
- <translation type="unfinished"></translation>
+ <translation>Sterownik SDL</translation>
 </message>
 <message>
 <location line="+60"/>
 <source>System language</source>
- <translation type="unfinished"></translation>
+ <translation>Język systemu</translation>
 </message>
 <message>
 <location line="+25"/>
 <source>_Language</source>
- <translation type="unfinished"></translation>
+ <translation>Język</translation>
 </message>
 <message>
 <location line="+34"/>
 <source>_Limit Refresh Rate</source>
- <translation type="unfinished"></translation>
+ <translation>Ogranicz szybkość odświeżania</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Refresh Rate Cap (ms)</source>
- <translation type="unfinished"></translation>
+ <translation>Limit szybkości odświeżania (ms)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>GUI Rendering Options</source>
- <translation type="unfinished"></translation>
+ <translation>Opcje renderowania interfejsu</translation>
 </message>
 <message>
 <location line="+16"/>
 <source>Display</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetlanie</translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
- <translation type="unfinished"></translation>
+ <translation>Akceleracja sprzętowa</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze pytaj, który port użyć</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Default port to use</source>
- <translation type="unfinished"></translation>
+ <translation>Domyślny port do użycia</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
 <source>Open</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Append</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Save</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../common/gui_save.cpp" line="+14"/>
 <location line="+10"/>
 <source>Queue</source>
- <translation type="unfinished"></translation>
+ <translation>Kolejka</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Save as Image</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz jako grafikę</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Save as BMP</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz jako BMP</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation>Zapisz jako PNG</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Save as JPEG</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz jako JPEG</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation>Zapisz zaznaczenie jako JPEG</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Information</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Connect to avsproxy</source>
- <translation type="unfinished"></translation>
+ <translation>Połącz z avsproxy</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjście</translation>
 </message>
 <message>
 <location line="+8"/>
 <location line="+2"/>
 <source>Clear recent items</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść ostatnie elementy</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Undo</source>
- <translation type="unfinished"></translation>
+ <translation>Cofnij</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Redo</source>
- <translation type="unfinished"></translation>
+ <translation>Powtórz</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Reset Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Resetuj edycję</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Cut</source>
- <translation type="unfinished"></translation>
+ <translation>Wytnij</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Paste</source>
- <translation type="unfinished"></translation>
+ <translation>Wklej</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Set Marker A</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw znacznik A</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Set Marker B</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw znacznik B</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Reset Markers</source>
- <translation type="unfinished"></translation>
+ <translation>Zresetuj znaczniki</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Save current settings as default</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz bieżące ustawienia jako domyślne</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Load saved settings</source>
- <translation type="unfinished"></translation>
+ <translation>Wczytaj zapisane ustawienia</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Decoder Option</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia dekodera</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>PostProcessing</source>
- <translation type="unfinished"></translation>
+ <translation>Przetwarzanie końcowe</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation>Odtwórz filtrowane</translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz ścieżkę</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Save audio</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz audio</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Build Option</source>
- <translation type="unfinished"></translation>
+ <translation>Opcje buildu</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Wtyczki</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>&amp;Advanced</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Open Application &amp;Log</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz dziennik aplikacji</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Open Application Data &amp;Folder</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz folder danych aplikacji</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>About</source>
- <translation type="unfinished"></translation>
+ <translation>O programie</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Play/Stop</source>
- <translation type="unfinished"></translation>
+ <translation>Odtwórz/Zatrzymaj</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Previous Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia klatka</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Next Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Następna klatka</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Previous Intra Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia Intra Frame</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Next Intra Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Następna Intra Frame</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Previous Black Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia czarna klatka</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Next Black Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Następna czarna klatka</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>First Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Pierwsza klatka</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Last Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnia klatka</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Go To Marker A</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do znacznika A</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Go To Marker B</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do znacznika B</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Go To Time</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do czasu</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Zoom 1:4</source>
- <translation type="unfinished"></translation>
+ <translation>Skala 1:4 (mały)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Zoom 1:2</source>
- <translation type="unfinished"></translation>
+ <translation>Skala 1:2</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Zoom 1:1</source>
- <translation type="unfinished"></translation>
+ <translation>Skala 1:1</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Zoom 2:1</source>
- <translation type="unfinished"></translation>
+ <translation>Skala 2:1 (duży)</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
- <translation type="unfinished"></translation>
+ <translation>Nie możesz usunąć *całego* wideo
+</translation>
 </message>
 <message>
 <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
 <source>Updating frametype</source>
- <translation type="unfinished"></translation>
+ <translation>Aktualizacja typu klatki</translation>
 </message>
 <message>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
 <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
 Installation mismatch</source>
- <translation type="unfinished"></translation>
+ <translation>Jądro zostało skompilowane bez wsparcia LIBVA, ale aplikacja została skompilowana z jego wsparciem.
+Niezgodność instalacji</translation>
 </message>
 <message>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
 <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
 Installation mismatch</source>
- <translation type="unfinished"></translation>
+ <translation>Jądro zostało skompilowane bez wsparcia VDPAU, ale aplikacja została skompilowana z jego wsparciem.
+Niezgodność instalacji</translation>
 </message>
 <message>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
 <source>Core has been compiled without XVBA support, but the application has been compiled with it.
 Installation mismatch</source>
- <translation type="unfinished"></translation>
+ <translation>Jądro zostało skompilowane bez wsparcia XVBA, ale aplikacja została skompilowana z jego wsparciem.
+Niezgodność instalacji</translation>
 </message>
 <message>
 <location filename="../../common/gui_autodrive.cpp" line="-144"/>
 <source>No audio track</source>
- <translation type="unfinished"></translation>
+ <translation>Brak ścieżki dźwiękowej</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>An audio track is necessary to create such file</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka dźwiękowa jest niezbędna do utworzenia takiego pliku</translation>
 </message>
 <message>
 <location line="+16"/>
 <source>Cannot select the MPEG-4 SP codec.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wybrać kodeka MPEG-4 SP.</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>No AAC audio encoder plugin found.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie znaleziono dekodera dźwięku AAC.</translation>
 </message>
 <message>
 <location line="+32"/>
 <source>The MP3 codec does not allow disabling reservoir.
 Install lame plugin</source>
- <translation type="unfinished"></translation>
+ <translation>Kodek MP3 nie pozwala na wyłączenie zasobu.
+Zainstaluj plugin lame</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>You don&apos;t have LAME!.
 It is needed to create FLV video.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie posiadasz LAME!
+Jest on wymagany do tworzenia wideo FLV.</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Cannot select FLV1 codec.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wybrać kodeka FLV1.</translation>
 </message>
 <message>
 <location line="+27"/>
 <source>Cannot select MPEG-4 SP codec.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wybrać kodeka MPEG-4 SP.</translation>
 </message>
 <message>
 <location line="+36"/>
 <source>You don&apos;t have FAAC!.
 It is needed to create PSP compatible video.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie posiadasz FAAC!
+Jest on wymagany do tworzenia wideo kompatybilnego z PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz skrypt/projekt do uruchomienia</translation>
 </message>
 <message>
 <location line="+24"/>
 <source>Select script to run</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz skrypt do uruchomienia</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Select script to debug</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz skrypt do debugowania</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Select script to save</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz skrypt do zapisania</translation>
 </message>
 <message>
 <location line="+67"/>
 <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
- <translation type="unfinished"></translation>
+ <translation>Zamierzasz wyczyścić listę ostatnich plików i projektów. Tego nie można cofnąć. Kontynuować?</translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik wideo...</translation>
 </message>
 <message>
 <location line="-43"/>
 <source>No engine</source>
- <translation type="unfinished"></translation>
+ <translation>Brak silnika</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>tinyPy script is not enabled in this build</source>
- <translation type="unfinished"></translation>
+ <translation>Skrypt tinyPy nie jest włączony w tej kompilacji</translation>
 </message>
 <message>
 <location line="+46"/>
 <source>Select Video File to Append...</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik wideo do dołączenia...</translation>
+ </message>
+ <message>
+ <location line="+114"/>
+ <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>Punkty cięcia wklejonego wideo nie znajdują się na klatkach kluczowych.
+Wideo zapisane w trybie kopiowania będzie uszkodzone w tych miejscach.
+Czy kontynuować mimo to?</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+102"/>
+ <location line="+21"/>
 <source>Cutting</source>
- <translation type="unfinished"></translation>
+ <translation>Przycinanie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Error while cutting out.</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas wycinania.</translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
- <translation type="unfinished"></translation>
+ <translation>Podano nieprawidłowy indeks audio</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Cannot use that file as audio track</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można użyć tego pliku jako ścieżki audio</translation>
 </message>
 <message>
 <location line="+28"/>
 <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
- <translation type="unfinished"></translation>
+ <translation>Nie znaleziono pliku audio na liście, mimo że powinien tam być. Utwórz raport o błędzie!</translation>
 </message>
 <message>
 <location line="+24"/>
 <source>Unable to set the audio language: No video loaded yet!</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można ustawić języka audio: Nie załadowano jeszcze filmu!</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienie języka dla podanego indeksu ścieżki nie jest możliwe: Wideo nie zawiera pliku audio!</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Setting the language for the given track index is not possible: Invalid track index!</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienie języka dla podanego indeksu ścieżki nie jest możliwe: Nieprawidłowy indeks ścieżki!</translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
- <translation type="unfinished">Oops</translation>
+ <translation>Oops</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>This function is disabled or no longer valid</source>
- <translation type="unfinished"></translation>
+ <translation>Ta funkcja jest wyłączona lub nie jest już obowiązująca</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
- <translation type="unfinished">Urządzenie dźwiękowe jest nie skonfigurowane</translation>
+ <translation>Problem z zainicjowaniem urządzenia audio</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
- <translation type="unfinished">Nie</translation>
+ <translation>Nie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>No file loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Nie załadowano pliku</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Job</source>
- <translation type="unfinished"></translation>
+ <translation>Zadanie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Cannot reach database. Do you have Job control running ?</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można połączyć się z bazą danych. Czy Kontrola zadań jest uruchomiona?</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Output file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik wyjściowy</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Job name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa zadania</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Queue job to jobList</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj zadanie do kolejki</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation>Wybierz plik PNG do zapisu</translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
- <translation type="unfinished"></translation>
+ <translation>Funkcja nie zaimplementowana
+</translation>
 </message>
 <message>
 <location line="+21"/>
 <source>Cannot create stream</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć strumienia</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Saving failed</source>
- <translation type="unfinished">Zapisywanie nie udało się</translation>
+ <translation>Zapisywanie nie udało się</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
+ <translation>Jpeg</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as JPEG</source>
+ <translation>Nie udało się zapisać jako JPEG</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation>Zapisywanie zaznaczenia w postaci zestawu obrazów JPEG</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation>Osiągnięto maksymalną liczbę 9999 obrazów, przerywam.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation>Zapisywanie obrazów nie powiodło się.</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation>PNG</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation>Nie udało się zapisać jako PNG</translation>
+ </message>
+ <message>
 <source>Fail to save as jpeg</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Nie udało się zapisać jako JPEG</translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Cannot add job %s</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można dodać zadania %s</translation>
 </message>
 <message>
 <location filename="../../common/gui_savenew.cpp" line="-196"/>
@@ -7658,12 +7837,12 @@
 <location line="+12"/>
 <location line="+24"/>
 <source>Cannot create encoder</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć kodera</translation>
 </message>
 <message>
 <location line="-8"/>
 <source>Cannot setup codec. Bitrate too low?</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można skonfigurować kodeka. Zbyt mała szybkość transmisji?</translation>
 </message>
 <message>
 <location line="+45"/>
@@ -7693,57 +7872,57 @@
 <message>
 <location line="+26"/>
 <source>Cannot open </source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć </translation>
 </message>
 <message>
 <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
 <source>Disabled</source>
- <translation type="unfinished">Wyłączony</translation>
+ <translation>Wyłączony</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Auto-detect</source>
- <translation type="unfinished">Automatyczne wykrycie</translation>
+ <translation>Automatyczne wykrycie</translation>
 </message>
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-12"/>
 <source>_Interlaced</source>
- <translation type="unfinished"></translation>
+ <translation>Z przeplotem</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Ca_rtoon mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb kreskówki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Greyscale</source>
- <translation type="unfinished"></translation>
+ <translation>_Skala szarości</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Turbo mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb turbo</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>C_hroma optimizer</source>
- <translation type="unfinished"></translation>
+ <translation>Optymalizator c_hrominancji</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Main</source>
- <translation type="unfinished"></translation>
+ <translation>Główne</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Very Low</source>
- <translation type="unfinished"></translation>
+ <translation>Bardzo niska</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Very High</source>
- <translation type="unfinished"></translation>
+ <translation>Bardzo wysoka</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7753,7 +7932,7 @@
 <message>
 <location line="+1"/>
 <source>Motion Search Precision</source>
- <translation type="unfinished"></translation>
+ <translation>Precyzja wykrywania ruchu</translation>
 </message>
 <message>
 <location line="+3"/>
@@ -7783,7 +7962,7 @@
 <message>
 <location line="+1"/>
 <source>VHQ Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb VHQ</translation>
 </message>
 <message>
 <location line="+4"/>
@@ -7798,22 +7977,22 @@
 <message>
 <location line="+1"/>
 <source>GMC</source>
- <translation type="unfinished"></translation>
+ <translation>GMC</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>BVHQ</source>
- <translation type="unfinished"></translation>
+ <translation>BVHQ</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Advanced Simple Profile</source>
- <translation type="unfinished"></translation>
+ <translation>Advanced Simple Profile</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>4MV</source>
- <translation type="unfinished"></translation>
+ <translation>4MV</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7823,7 +8002,7 @@
 <message>
 <location line="+1"/>
 <source>HQ AC</source>
- <translation type="unfinished"></translation>
+ <translation>HQ AC</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -7848,32 +8027,32 @@
 <message>
 <location line="+5"/>
 <source>Motion</source>
- <translation type="unfinished"></translation>
+ <translation>Ruch</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>H263</source>
- <translation type="unfinished"></translation>
+ <translation>H263</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Mpeg</source>
- <translation type="unfinished"></translation>
+ <translation>Mpeg</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Quantization Matrix</source>
- <translation type="unfinished"></translation>
+ <translation>Matryca kwantyzacji</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Trellis Quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja Trellis</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja</translation>
 </message>
 <message>
 <location line="+4"/>
@@ -7928,158 +8107,153 @@
 <message>
 <location line="+3"/>
 <source>Two Pass</source>
- <translation type="unfinished"></translation>
+ <translation>Dwa przebiegi</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Xvid4 Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja Xvid4</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
 <source>%d minute(s)</source>
- <translation type="unfinished"></translation>
+ <translation>%d minut(y)</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>%d hour(s)</source>
- <translation type="unfinished"></translation>
+ <translation>%d godzin(y)</translation>
 </message>
 <message>
 <location line="+18"/>
 <source>Less than a minute</source>
- <translation type="unfinished"></translation>
+ <translation>Mniej niż minutę</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>A few seconds</source>
- <translation type="unfinished"></translation>
+ <translation>Kilka sekund</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-1"/>
 <source>DTS</source>
- <translation type="unfinished">DTS</translation>
+ <translation>DTS</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>MP2</source>
- <translation type="unfinished">MP2</translation>
+ <translation>MP2</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MP3</source>
- <translation type="unfinished">MP3</translation>
+ <translation>MP3</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>WMAPRO</source>
- <translation type="unfinished"></translation>
+ <translation>WMAPRO</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>WMA</source>
- <translation type="unfinished">WMA</translation>
+ <translation>WMA</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>LPCM</source>
- <translation type="unfinished">LPCM</translation>
+ <translation>LPCM</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>AC3</source>
- <translation type="unfinished">AC3</translation>
+ <translation>AC3</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>OPUS</source>
- <translation type="unfinished"></translation>
+ <translation>OPUS</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>FLAC</source>
- <translation type="unfinished"></translation>
+ <translation>FLAC</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>E-AC3</source>
- <translation type="unfinished"></translation>
+ <translation>E-AC3</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Ogg Vorbis</source>
- <translation type="unfinished">Ogg Vorbis</translation>
+ <translation>Ogg Vorbis</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MP4</source>
- <translation type="unfinished">MP4</translation>
+ <translation>MP4</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>AAC</source>
- <translation type="unfinished">AAC</translation>
+ <translation>AAC</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>QDM2</source>
- <translation type="unfinished">QDM2</translation>
+ <translation>QDM2</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>AMR-NB</source>
- <translation type="unfinished">AMR-NB</translation>
+ <translation>AMR-NB</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MSADPCM</source>
- <translation type="unfinished">MSADPCM</translation>
+ <translation>MSADPCM</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>ULAW</source>
- <translation type="unfinished">ULAW</translation>
+ <translation>ULAW</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>IMA ADPCM</source>
- <translation type="unfinished">IMA ADPCM</translation>
+ <translation>IMA ADPCM</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>8-bit PCM</source>
- <translation type="unfinished">8-bit PCM</translation>
+ <translation>8-bit PCM</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Unknown codec</source>
- <translation type="unfinished">Nieznany kodek</translation>
+ <translation>Nieznany kodek</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
- <translation type="unfinished"></translation>
+ <translation>Budowanie mapy czasu</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
- <translation type="unfinished">Błąd alokacji pamięci</translation>
+ <translation>Błąd pamięci</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+6"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
 <source>Unknown</source>
- <translation type="unfinished">Nieznany</translation>
+ <translation>Nieznany</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
@@ -8092,13 +8266,13 @@
 <location line="+2"/>
 <location line="+85"/>
 <source>filesystem full</source>
- <translation type="unfinished"></translation>
+ <translation>system plików zapełniony</translation>
 </message>
 <message>
 <location line="-85"/>
 <location line="+85"/>
 <source>quota exceeded</source>
- <translation type="unfinished"></translation>
+ <translation>rozmiar udziału przekroczony</translation>
 </message>
 <message>
 <location line="-84"/>
@@ -8128,7 +8302,7 @@
 <message>
 <location line="-8"/>
 <source>Ignore</source>
- <translation type="unfinished">Ignoruj</translation>
+ <translation>Ignoruj</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -8144,36 +8318,36 @@
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
 <source>NTSC 4:3</source>
- <translation type="unfinished">NTSC 4:3</translation>
+ <translation>NTSC 4:3</translation>
 </message>
 <message>
 <location line="+1"/>
 <location line="+1"/>
 <source>NTSC 16:9</source>
- <translation type="unfinished">NTSC 16:9</translation>
+ <translation>NTSC 16:9</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>PAL 4:3</source>
- <translation type="unfinished">PAL 4:3</translation>
+ <translation>PAL 4:3</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>PAL 16:9</source>
- <translation type="unfinished">PAL 16:9</translation>
+ <translation>PAL 16:9</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>1:1</source>
- <translation type="unfinished">1:1</translation>
+ <translation>1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
 <source>Codec</source>
- <translation type="unfinished"></translation>
+ <translation>Kodek</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
@@ -8196,18 +8370,64 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation>Nie można otworzyć skryptu &quot;%s&quot;.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation>Błąd pliku</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation>Skrypt &quot;%s&quot; nie istnieje.</translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
 <source>ADM ivtc.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Inverse Telecining</translatorcomment>
+ <translation>Odwrotne telekinowanie</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>All in one ivtc.</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Inverse Telecining</translatorcomment>
+ <translation>Wszystko w jednym IVTC.</translation>
 </message>
 </context>
 <context>
@@ -8215,12 +8435,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
 <source>_Bitrate:</source>
- <translation type="unfinished">_Przepływność:</translation>
+ <translation>_Przepływność:</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Aften Configuration</source>
- <translation type="unfinished">Konfiguracja Aften</translation>
+ <translation>Konfiguracja Aften (A/52)</translation>
 </message>
 </context>
 <context>
@@ -8228,12 +8448,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
 <source>Ascii View</source>
- <translation type="unfinished"></translation>
+ <translation>Widok ASCII</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Ascii view</source>
- <translation type="unfinished"></translation>
+ <translation>Widok ASCII</translation>
 </message>
 </context>
 <context>
@@ -8241,18 +8461,19 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
 <source>File Error.</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd pliku.</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Cannot open file
 </source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku
+</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+471"/>
 <source>Indexing</source>
- <translation type="unfinished">Indeksowanie</translation>
+ <translation>Indeksowanie</translation>
 </message>
 </context>
 <context>
@@ -8260,12 +8481,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="+66"/>
 <source>Adaptative sharpener by MarcFD.</source>
- <translation type="unfinished">Inteligentne wyostrzanie od MarcFD.</translation>
+ <translation>Inteligentne wyostrzanie od MarcFD.</translation>
 </message>
 <message>
 <location line="-1"/>
 <source>Asharp</source>
- <translation type="unfinished"></translation>
+ <translation>Asharp</translation>
 </message>
 </context>
 <context>
@@ -8273,17 +8494,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui" line="+124"/>
 <source>Threshold</source>
- <translation type="unfinished">Próg</translation>
+ <translation>Próg</translation>
 </message>
 <message>
 <location line="-110"/>
 <source>ASharp</source>
- <translation type="unfinished"></translation>
+ <translation>Asharp</translation>
 </message>
 <message>
 <location line="+123"/>
 <source>Strength</source>
- <translation type="unfinished"></translation>
+ <translation>Natężenie</translation>
 </message>
 <message>
 <location line="-33"/>
@@ -8301,42 +8522,42 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+171"/>
 <source>_Subtitle file (ASS/SSA):</source>
- <translation type="unfinished">Plik z _napisami (ASS/SSA):</translation>
+ <translation>Plik z _napisami (ASS/SSA):</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Select Subtitle file</source>
- <translation type="unfinished">Wybierz plik z napisami</translation>
+ <translation>Wybierz plik z napisami</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Line spacing:</source>
- <translation type="unfinished">Odstęp pomiędzy _liniami:</translation>
+ <translation>Odstęp pomiędzy _liniami:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Font scale:</source>
- <translation type="unfinished">Skalowanie _czcionki</translation>
+ <translation>Skalowanie _czcionki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Top margin:</source>
- <translation type="unfinished">Margines _górny</translation>
+ <translation>Margines _górny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Botto_m margin</source>
- <translation type="unfinished">Margines _dolny:</translation>
+ <translation>Margines _dolny:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>ASS</source>
- <translation type="unfinished">ASS</translation>
+ <translation>ASS</translation>
 </message>
 <message>
 <location line="-112"/>
 <source>SSA/ASS/SRT</source>
- <translation type="unfinished"></translation>
+ <translation>SSA/ASS/SRT</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -8351,39 +8572,39 @@
 <message>
 <location line="+0"/>
 <source>Are you sure this is an ass file ?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy na pewno jest to plik ASS?</translation>
 </message>
 <message>
 <location line="+56"/>
 <source>This is a srt file. Convert to SSA ?</source>
- <translation type="unfinished"></translation>
+ <translation>To jest plik SRT. Przekonwertować na SSA?</translation>
 </message>
 <message>
 <location line="+7"/>
 <location line="+5"/>
 <location line="+8"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
 <location line="-13"/>
 <source>Cannot load this srt file.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wczytać tego pliku SRT.</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Cannot convert to ssa.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przekonwertować na SSA.</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Cannot save converted file.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać skonwertowanego pliku.</translation>
 </message>
 <message>
 <location line="+55"/>
 <source>Fonts</source>
- <translation type="unfinished"></translation>
+ <translation>Czcionki</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -8394,7 +8615,7 @@
 <message>
 <location line="+27"/>
 <source>SSA Error</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd SSA</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -8414,33 +8635,34 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
 <source>Bad Idea</source>
- <translation type="unfinished"></translation>
+ <translation>Kiepski pomysł</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
 Do you want to continue anyway ?</source>
- <translation type="unfinished"></translation>
+ <translation>Używanie H264/H265 w AVI to kiepski pomysł, MKV jest do tego lepszy.
+Czy pomimo tego chcesz kontynuować?</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Cannot create AVI file</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć pliku AVI</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
 <source>Muxing Format</source>
- <translation type="unfinished"></translation>
+ <translation>Format muksowania</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Avi Muxer</source>
- <translation type="unfinished"></translation>
+ <translation>Mukser AVI</translation>
 </message>
 </context>
 <context>
@@ -8448,32 +8670,32 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+598"/>
 <source>_wine app file:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">plik aplikacji _wine:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Select wine filename[wine/cedega/etc.]</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz nazwę pliku wine [wine/cedega/itp.]</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_loader file:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">plik _loadera:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Select loader filename[avsload.exe]</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Wybierz plik loadera [avsload.exe]</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_avs file:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">plik _avs:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Select avs filename[*.avs]</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Wybierz plik avs [*.avs]</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -8491,17 +8713,17 @@
 <message>
 <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
 <source>Constant Bitrate</source>
- <translation type="unfinished"></translation>
+ <translation>Stała przepływność</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Constant Quantiser</source>
- <translation type="unfinished"></translation>
+ <translation>Stała kwantyzacja</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Same Quantiser as Input</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja taka sama jak wejściowa</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -8511,48 +8733,48 @@
 <message>
 <location line="+1"/>
 <source>Two Pass - Video Size</source>
- <translation type="unfinished"></translation>
+ <translation>Dwa przebiegi - Rozmiar wideo</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Two Pass - Average Bitrate</source>
- <translation type="unfinished"></translation>
+ <translation>Dwa przebiegi - Średnia przepływność</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Encoding mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb kodowania</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Bitrate</source>
- <translation type="unfinished"></translation>
+ <translation>Przepływność</translation>
 </message>
 <message>
 <location line="+86"/>
 <source>Target bitrate (kb/s)</source>
- <translation type="unfinished"></translation>
+ <translation>Docelowa przepływność (kb/s)</translation>
 </message>
 <message>
 <location line="+5"/>
 <location line="+19"/>
 <source>Quantizer</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzator</translation>
 </message>
 <message>
 <location line="-14"/>
 <source>Target video size (MB)</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar docelowego wideo (MB)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Average bitrate (kb/s)</source>
- <translation type="unfinished"></translation>
+ <translation>Średnia przepływność (kb/s)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
 </message>
 </context>
 <context>
@@ -8560,27 +8782,27 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
 <source>Black</source>
- <translation type="unfinished"></translation>
+ <translation>Czerń</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Replace a section by black.</source>
- <translation type="unfinished"></translation>
+ <translation>Zastąp fragment czarnym obrazem.</translation>
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished"></translation>
+ <source>_Start time:</source>
+ <translation>Czas początkowy:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished"></translation>
+ <source>_End time:</source>
+ <translation>Czas końcowy:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
- <translation type="unfinished"></translation>
+ <translation>Zastąp czarnym</translation>
 </message>
 </context>
 <context>
@@ -8604,7 +8826,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
 <source>Blacken Borders</source>
- <translation type="unfinished">Zaczernij krawędzie</translation>
+ <translation>Zaczernij krawędzie</translation>
 </message>
 <message>
 <source>Incorrect parameters</source>
@@ -8617,7 +8839,7 @@
 <message>
 <location line="+1"/>
 <source>Remove noisy edge by turning them to black.</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń szum krawędzi, zmieniając je na czarne.</translation>
 </message>
 </context>
 <context>
@@ -8656,32 +8878,32 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+14"/>
 <source>Blacken Borders</source>
- <translation type="unfinished"></translation>
+ <translation>Przyciemnienie krawędzi</translation>
 </message>
 <message>
 <location line="+38"/>
 <source>Right:</source>
- <translation type="unfinished"></translation>
+ <translation>Prawa:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Top:</source>
- <translation type="unfinished"></translation>
+ <translation>Góra:</translation>
 </message>
 <message>
 <location line="+43"/>
 <source>Reset</source>
- <translation type="unfinished"></translation>
+ <translation>Resetuj</translation>
 </message>
 <message>
 <location line="+21"/>
 <source>Bottom:</source>
- <translation type="unfinished"></translation>
+ <translation>Dół:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Left:</source>
- <translation type="unfinished"></translation>
+ <translation>Lewa:</translation>
 </message>
 </context>
 <context>
@@ -8707,7 +8929,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
 <source>Custom</source>
- <translation type="unfinished">Własna</translation>
+ <translation>Własne</translation>
 </message>
 <message>
 <source>_Mode:</source>
@@ -8724,72 +8946,72 @@
 <message>
 <location line="+1"/>
 <source>25 (PAL)</source>
- <translation type="unfinished"></translation>
+ <translation>25 (PAL)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>23.976 (Film)</source>
- <translation type="unfinished"></translation>
+ <translation>23.976 (Film)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>29.97 (NTSC)</source>
- <translation type="unfinished"></translation>
+ <translation>29.97 (NTSC)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>50 (Pal)</source>
- <translation type="unfinished"></translation>
+ <translation>50 (Pal)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>59.93 (NTSC)</source>
- <translation type="unfinished"></translation>
+ <translation>59.93 (NTSC)</translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień FPS</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"></translation>
+ <translation>Przyśpiesz/zwolnij wideo, zmieniając jego FPS. Ten filr zmieni także długość.</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
- <translation type="unfinished"></translation>
+ <translation>Źródłowy FPS:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Source frame rate:</source>
- <translation type="unfinished"></translation>
+ <translation>Własny FPS źródła:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Destination Fps:</source>
- <translation type="unfinished"></translation>
+ <translation>Docelowy FPS:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Destination frame rate:</source>
- <translation type="unfinished"></translation>
+ <translation>Własny docelowy FPS:</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Change fps</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień liczbę klatek na sekundę</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Invalid fps</source>
- <translation type="unfinished"></translation>
+ <translation>Nieprawidłowy FPS</translation>
 </message>
 </context>
 <context>
@@ -8797,12 +9019,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+36"/>
 <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
- <translation type="unfinished">Zamień chrominancję U/V aby naprawić źle zsynchronizowane luminancję/chrominancję.</translation>
+ <translation>Zamień chrominancję U/V aby naprawić źle zsynchronizowaną luminancję/chrominancję.</translation>
 </message>
 <message>
 <location line="-1"/>
 <source>ChromaShift</source>
- <translation type="unfinished">Przesunięcie chrominancji</translation>
+ <translation>Przesunięcie chrominancji</translation>
 </message>
 </context>
 <context>
@@ -8810,17 +9032,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
 <source>ChromaShift</source>
- <translation type="unfinished">Przesunięcie chrominancji</translation>
+ <translation>Przesunięcie chrominancji</translation>
 </message>
 <message>
 <location line="+47"/>
 <source>V Shift</source>
- <translation type="unfinished"></translation>
+ <translation>Przesunięcie V</translation>
 </message>
 <message>
 <location line="-23"/>
 <source>U Shift</source>
- <translation type="unfinished"></translation>
+ <translation>Przesunięcie U</translation>
 </message>
 </context>
 <context>
@@ -8828,122 +9050,122 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+78"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="-16"/>
 <source>Avisynth color filter.</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr kolorów Avisynth</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Color management filter.</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr zarządzania kolorami.</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>AutoWhite</source>
- <translation type="unfinished"></translation>
+ <translation>Automatyczna biel</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>AutoGain</source>
- <translation type="unfinished"></translation>
+ <translation>Automatyczne wzmocnienie</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Clip to Tv Range (16-235)</source>
- <translation type="unfinished"></translation>
+ <translation>Przytnij do zakresu Tv (16-235)</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>PC-&gt;TV</source>
- <translation type="unfinished"></translation>
+ <translation>PC-&gt;TV</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>TV-&gt;PC</source>
- <translation type="unfinished"></translation>
+ <translation>TV-&gt;PC</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Levels:</source>
- <translation type="unfinished"></translation>
+ <translation>Poziomy:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Y gain</source>
- <translation type="unfinished"></translation>
+ <translation>Wzmocnienie Y</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Y Brightness</source>
- <translation type="unfinished"></translation>
+ <translation>Jasność Y</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Y Gamma</source>
- <translation type="unfinished"></translation>
+ <translation>Gamma Y</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Y Contrast</source>
- <translation type="unfinished"></translation>
+ <translation>Kontrast Y</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>U gain</source>
- <translation type="unfinished"></translation>
+ <translation>Wzmocnienie U</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>U Brightness</source>
- <translation type="unfinished"></translation>
+ <translation>Jasność U</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>U Contrast</source>
- <translation type="unfinished"></translation>
+ <translation>Kontrast U</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>V gain</source>
- <translation type="unfinished"></translation>
+ <translation>Wzmocnienie V</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>V Brightness</source>
- <translation type="unfinished"></translation>
+ <translation>Jasność V</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>V Contrast</source>
- <translation type="unfinished"></translation>
+ <translation>Kontrast V</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Flags</source>
- <translation type="unfinished"></translation>
+ <translation>Flagi</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Y</source>
- <translation type="unfinished"></translation>
+ <translation>Y</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>U</source>
- <translation type="unfinished"></translation>
+ <translation>U</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>V</source>
- <translation type="unfinished"></translation>
+ <translation>V</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>colorYuv</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr kolorów Yuv</translation>
 </message>
 </context>
 <context>
@@ -8951,20 +9173,20 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+35"/>
 <source>Adjust contrast, brightness and colors.</source>
- <translation type="unfinished">Dostosuj kontrast, jasność i kolory.</translation>
+ <translation>Dostosuj kontrast, jasność i kolory.</translation>
 </message>
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
- <translation type="unfinished">Kontrast</translation>
+ <translation>Kontrast</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
- <translation type="unfinished"></translation>
+ <translation>Jasność</translation>
 </message>
 </context>
 <context>
@@ -8973,47 +9195,47 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui" line="+14"/>
 <location line="+19"/>
 <source>Contrast</source>
- <translation type="unfinished">Kontrast</translation>
+ <translation>Kontrast</translation>
 </message>
 <message>
 <location line="+94"/>
 <source>Luma</source>
- <translation type="unfinished">Luminancja</translation>
+ <translation>Luminancja</translation>
 </message>
 <message>
 <location line="-53"/>
 <source>Brightness</source>
- <translation type="unfinished">Jasność</translation>
+ <translation>Jasność</translation>
 </message>
 <message>
 <location line="-48"/>
 <source>Contrast </source>
- <translation type="unfinished"></translation>
+ <translation>Kontrast </translation>
 </message>
 <message>
 <location line="+41"/>
 <source>Brightness </source>
- <translation type="unfinished"></translation>
+ <translation>Jasność </translation>
 </message>
 <message>
 <location line="+46"/>
 <source>ChromaU</source>
- <translation type="unfinished"></translation>
+ <translation>Chrominancja U</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>ChromaV</source>
- <translation type="unfinished"></translation>
+ <translation>Chrominancja V</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Process</source>
- <translation type="unfinished"></translation>
+ <translation>Przetwarzaj</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>MPEG2-&gt;PC</source>
- <translation type="unfinished"></translation>
+ <translation>MPEG2-&gt;PC</translation>
 </message>
 </context>
 <context>
@@ -9021,22 +9243,22 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+136"/>
 <source>_Process luma</source>
- <translation type="unfinished">_Przetwarzanie luminancji</translation>
+ <translation>_Przetwarzanie luminancji</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Process luma plane</source>
- <translation type="unfinished">Przetwarzaj obszar luminancji</translation>
+ <translation>Przetwarzaj obszar luminancji</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>P_rocess chroma</source>
- <translation type="unfinished">P_rzetwarzanie chrominancji</translation>
+ <translation>P_rzetwarzanie chrominancji</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Fast Convolution</source>
- <translation type="unfinished">Szybki splot</translation>
+ <translation>Szybki splot</translation>
 </message>
 </context>
 <context>
@@ -9044,19 +9266,19 @@
 <message>
 <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
 <source>Load it</source>
- <translation type="unfinished">Wczytaj</translation>
+ <translation>Wczytaj</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Crash file</source>
- <translation type="unfinished">Plik awarii</translation>
+ <translation>Plik awarii</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>I have detected a crash file. 
 Do you want to load it ?
 (It will be deleted in all cases, you should save it if you want to keep it)</source>
- <translation type="unfinished">Wykryto plik awarii. 
+ <translation>Wykryto plik awarii. 
 Czy chcesz go wczytać ? 
 (Zostanie on później usunięty, powinieneś go zapisać jeśli chcesz go zachować)</translation>
 </message>
@@ -9066,24 +9288,29 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
 <source>Crop</source>
- <translation type="unfinished"></translation>
+ <translation>Kadrowanie</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Crop filter</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr kadrowania</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
- <translation type="unfinished"></translation>
+ <translation>Ostrzeżenie! Kadrowanie zbyt dużej szerokości! Szerokość zresetowana!</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Warning Cropping too much height ! Height reseted !
 </source>
- <translation type="unfinished"></translation>
+ <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"/>
+ <source>Size: </source>
+ <translation>Rozmiar: </translation>
 </message>
 </context>
 <context>
@@ -9092,42 +9319,52 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
 <source>Crop</source>
- <translation type="unfinished">Kadrowanie</translation>
+ <translation>Kadrowanie</translation>
 </message>
 <message>
 <location line="+146"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+119"/>
 <source>Auto Crop</source>
- <translation type="unfinished">Automatyczne kadrowanie</translation>
+ <translation>Automatyczne kadrowanie</translation>
 </message>
 <message>
 <location line="-108"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-108"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-44"/>
 <source>Right:</source>
- <translation type="unfinished"></translation>
+ <translation>Prawa:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
- <translation type="unfinished"></translation>
+ <translation>Góra:</translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
- <translation type="unfinished"></translation>
+ <translation>Resetuj</translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
- <translation type="unfinished"></translation>
+ <translation>Dół:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
+ <translation>Lewa:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+58"/>
+ <source>Size: </source>
+ <translation>Rozmiar: </translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -9136,12 +9373,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
 <source>_Bitrate:</source>
- <translation type="unfinished">_Przepływność:</translation>
+ <translation>_Przepływność:</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>DcaEnc Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja DcaEnc</translation>
 </message>
 </context>
 <context>
@@ -9149,17 +9386,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
 <source>Discard closer</source>
- <translation type="unfinished">Odrzuć bliższe</translation>
+ <translation>Odrzuć bliższe</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Replace (interpolate)</source>
- <translation type="unfinished">Zastąp (interpoluj)</translation>
+ <translation>Zastąp (interpoluj)</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Pulldown dupe removal</source>
- <translation type="unfinished">Usuwanie duplikatów z konwersji pulldown</translation>
+ <translation>Usuwanie duplikatów z konwersji pulldown</translation>
 </message>
 <message>
 <location line="+3"/>
@@ -9169,32 +9406,32 @@
 <message>
 <location line="+2"/>
 <source>Medium (full luma, no chroma)</source>
- <translation type="unfinished">Średni (pełna luminancja, brak chrominancji)</translation>
+ <translation>Średni (pełna luminancja, brak chrominancji)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>_Mode:</source>
- <translation type="unfinished">_Tryb:</translation>
+ <translation>_Tryb:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Quality:</source>
- <translation type="unfinished">_Jakość:</translation>
+ <translation>_Jakość:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Threshold 1:</source>
- <translation type="unfinished">_Próg 1:</translation>
+ <translation>_Próg 1:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>T_hreshold 2:</source>
- <translation type="unfinished">Pró_g 2:</translation>
+ <translation>Pró_g 2:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>C_ycle:</source>
- <translation type="unfinished">C_ykl:</translation>
+ <translation>C_ykl:</translation>
 </message>
 <message>
 <location line="+4"/>
@@ -9238,12 +9475,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+42"/>
 <source>Blend a logo by interpolating its surrounding box.</source>
- <translation type="unfinished">Nanieś logo przez interpolowanie jego otaczających krawędzi.</translation>
+ <translation>Rozmyj logo przez interpolowanie otaczającego go pola.</translation>
 </message>
 <message>
 <location line="-1"/>
 <source>MPlayer delogo2</source>
- <translation type="unfinished"></translation>
+ <translation>MPlayer delogo2</translation>
 </message>
 </context>
 <context>
@@ -9251,7 +9488,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+57"/>
 <source>Donald Graft Bob.</source>
- <translation type="unfinished">Bob od Donalda Grafta</translation>
+ <translation>Donald Graft Bob.</translation>
 </message>
 <message>
 <location line="+11"/>
@@ -9266,27 +9503,27 @@
 <message>
 <location line="+3"/>
 <source>Keep nb of frames and fps</source>
- <translation type="unfinished">Zachowaj liczbę klatek i kl./s</translation>
+ <translation>Zachowaj liczbę klatek i fps</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Double nb of frames and fps</source>
- <translation type="unfinished">Podwój liczbę klatek i kl./s</translation>
+ <translation>Podwój liczbę klatek i fps</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Double nb of frames (slow motion)</source>
- <translation type="unfinished">Podwój liczbę klatek (zwolnione tempo)</translation>
+ <translation>Podwój liczbę klatek (zwolnione tempo)</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>_Mode:</source>
- <translation type="unfinished">_Tryb:</translation>
+ <translation>_Tryb:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Threshold:</source>
- <translation type="unfinished">_Próg:</translation>
+ <translation>_Próg:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -9301,7 +9538,7 @@
 <message>
 <location line="+3"/>
 <source>DGBob</source>
- <translation type="unfinished">DGBob</translation>
+ <translation>DGBob</translation>
 </message>
 <message>
 <location line="-27"/>
@@ -9311,7 +9548,7 @@
 <message>
 <location line="+21"/>
 <source>_Top Field First:</source>
- <translation type="unfinished"></translation>
+ <translation>Najpierw półobraz górny</translation>
 </message>
 </context>
 <context>
@@ -9334,12 +9571,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp" line="+44"/>
 <source>Dummy</source>
- <translation type="unfinished">Pusty</translation>
+ <translation>Pusty</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Null filter, it does nothing at all.</source>
- <translation type="unfinished"></translation>
+ <translation>Pusty filtr, kompletnie nic nie robi.</translation>
 </message>
 </context>
 <context>
@@ -9347,7 +9584,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
 <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
- <translation type="unfinished"></translation>
+ <translation>DV wspiera tylko 720*576*25fps i 720*480*29.97fps</translation>
 </message>
 </context>
 <context>
@@ -9355,205 +9592,241 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
 <source>Encoding...</source>
- <translation type="unfinished">Kodowanie...</translation>
+ <translation>Kodowanie...</translation>
 </message>
 <message>
 <location line="+44"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
- <translation type="unfinished">Nieznany</translation>
+ <translation>Nieznany</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation>Kodek dźwięku:</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation>Kontener:</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation>Rozmiar dźwięku:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation>Całkowity rozmiar:</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation>Rozmiar wideo:</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
 <location line="+51"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
- <translation type="unfinished">0</translation>
+ <translation>0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation>Przetworzone klatki:</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source>Elapsed:</source>
+ <translation>Upłynęło:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
+ <translation>00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation>Klatki/sek:</translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
- <translation type="unfinished">0 MB</translation>
+ <translation>0 MB</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
- <translation type="unfinished">0 kB/s</translation>
+ <translation>0 kB/s</translation>
 </message>
 <message>
+ <location line="-31"/>
 <source>Average Bitrate:</source>
- <translation type="obsolete">Średnia przepływność:</translation>
+ <translation>Średnia przepływność:</translation>
 </message>
 <message>
+ <location line="+24"/>
 <source>Quantiser:</source>
- <translation type="obsolete">Kwantyzator:</translation>
+ <translation>Kwantyzator:</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-320"/>
 <source>Shut down computer when finished</source>
- <translation type="unfinished">Wyłącz komputer po ukończeniu</translation>
+ <translation>Wyłącz komputer po zakończeniu</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation>Pozostały czas:</translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
- <translation type="unfinished">Priorytet:</translation>
+ <translation>Priorytet:</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>High</source>
- <translation type="unfinished">Wysoki</translation>
+ <translation>Wysoki</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Above Normal</source>
- <translation type="unfinished">Powyżej standardowej</translation>
+ <translation>Powyżej normalnego</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Normal</source>
- <translation type="unfinished">Zwykły</translation>
+ <translation>Normalny</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Below Normal</source>
- <translation type="unfinished">Poniżej standardowej</translation>
+ <translation>Poniżej normalnego</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Low</source>
- <translation type="unfinished">Niski</translation>
+ <translation>Niski</translation>
 </message>
 <message>
 <location line="+45"/>
 <source>Pause / Abort</source>
- <translation type="unfinished">Wstrzymaj / Przerwij</translation>
+ <translation>Wstrzymaj / Przerwij</translation>
 </message>
 <message>
- <location line="-158"/>
+ <location line="-149"/>
 <source>Main</source>
- <translation type="unfinished"></translation>
+ <translation>Główne</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+35"/>
 <source>Phase:</source>
- <translation type="unfinished"></translation>
+ <translation>Faza:</translation>
 </message>
 <message>
- <location line="+7"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Pozostały czas:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+90"/>
+ <location line="+94"/>
 <source>Minimize to Tray</source>
- <translation type="unfinished"></translation>
+ <translation>Minimalizuj do zasobnika</translation>
 </message>
 <message>
 <location line="+33"/>
 <source>Advanced</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane</translation>
 </message>
 <message>
- <location line="+53"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Kodek dźwięku:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+24"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Kontener:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+16"/>
+ <location line="+81"/>
 <source>Video Codec:</source>
- <translation type="unfinished"></translation>
+ <translation>Kodek obrazu:</translation>
 </message>
 <message>
- <location line="+34"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Rozmiar audio:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Całkowity rozmiar:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+24"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Rozmiar wideo:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+47"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Średnia przepływność:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+20"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Przetworzone klatki:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Kwantyzer:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+51"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Upłynęło:&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+24"/>
 <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">&lt;b&gt;Klatek/sek:&lt;/b&gt;</translation>
 </message>
 </context>
 <context>
@@ -9588,17 +9861,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
 <source>MPlayer eq2</source>
- <translation type="unfinished">MPlayer eq2</translation>
+ <translation>MPlayer eq2</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Adjust contrast, brightness, saturation and gamma.</source>
- <translation type="unfinished">Dostosuj kontrast, jasność, nasycenie i gammę.</translation>
+ <translation>Dostosuj kontrast, jasność, nasycenie i gammę.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
- <translation type="unfinished"></translation>
+ <translation>Resetuj</translation>
 </message>
 </context>
 <context>
@@ -9615,47 +9888,47 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+14"/>
 <location line="+88"/>
 <source>Contrast</source>
- <translation type="unfinished">Kontrast</translation>
+ <translation>Kontrast</translation>
 </message>
 <message>
 <location line="-7"/>
 <source>Brightness</source>
- <translation type="unfinished">Jasność</translation>
+ <translation>Jasność</translation>
 </message>
 <message>
 <location line="-44"/>
 <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;b&gt;Gamma&lt;/b&gt;</translation>
 </message>
 <message>
 <location line="+37"/>
 <source>Saturation</source>
- <translation type="unfinished"></translation>
+ <translation>Nasycenie</translation>
 </message>
 <message>
 <location line="+106"/>
 <source>Blue</source>
- <translation type="unfinished"></translation>
+ <translation>Niebieski</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Red</source>
- <translation type="unfinished"></translation>
+ <translation>Czerwony</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Initial</source>
- <translation type="unfinished"></translation>
+ <translation>Wstępna</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Weight</source>
- <translation type="unfinished"></translation>
+ <translation>Waga</translation>
 </message>
 <message>
 <location line="+17"/>
 <source>Green</source>
- <translation type="unfinished"></translation>
+ <translation>Zielony</translation>
 </message>
 </context>
 <context>
@@ -9663,12 +9936,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
 <source>_Bitrate:</source>
- <translation type="unfinished">_Przepływność:</translation>
+ <translation>_Przepływność:</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Faac Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja Faac</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation>Konfiguracja Opus</translation>
 </message>
 </context>
 <context>
@@ -9713,73 +9991,73 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
- <translation type="unfinished">Zanikanie</translation>
+ <translation>Zanikanie</translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
- <translation type="unfinished"></translation>
+ <translation>Zanikanie.</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished"></translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation>Czas początkowy:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished"></translation>
+ <source>_End time:</source>
+ <translation>Czas końcowy:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
- <translation type="unfinished"></translation>
+ <translation>Przejście do czarnego</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
- <translation type="unfinished"></translation>
+ <translation>Przejście z/do czarnego</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
- <translation type="unfinished">Zanikanie</translation>
+ <translation>Zanikanie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Fade out</source>
- <translation type="unfinished">Zanikanie</translation>
+ <translation>Zanikanie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>In</source>
- <translation type="unfinished">Wyłanianie się</translation>
+ <translation>Wyłanianie się</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Fade in</source>
- <translation type="unfinished">Wyłanianie się</translation>
+ <translation>Wyłanianie się</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
- <translation type="unfinished">Typ _przenikania:</translation>
+ <translation>Typ przenikania:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished"></translation>
+ <source>_Start time:</source>
+ <translation>Czas początkowy:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished"></translation>
+ <source>_End time:</source>
+ <translation>Czas końcowy:</translation>
 </message>
 </context>
 <context>
@@ -9787,47 +10065,47 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
 <source>Default</source>
- <translation type="unfinished">Domyślna</translation>
+ <translation>Domyślna</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>KVCD</source>
- <translation type="unfinished">KVCD</translation>
+ <translation>KVCD</translation>
 </message>
 <message>
 <location line="+16"/>
 <source>Progressive</source>
- <translation type="unfinished">Przyrostowy</translation>
+ <translation>Progresywny</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>Threading</source>
- <translation type="unfinished">Wątkowanie</translation>
+ <translation>Wątkowanie</translation>
 </message>
 <message>
 <location line="+36"/>
 <source>Interlacing</source>
- <translation type="unfinished">Przeplot</translation>
+ <translation>Międzyliniowy</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Rate Control</source>
- <translation type="unfinished">Kontrola przepływności</translation>
+ <translation>Kontrola przepływności</translation>
 </message>
 <message>
 <location line="-86"/>
 <source>Normal (4:3)</source>
- <translation type="unfinished"></translation>
+ <translation>Normalny (4:3)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Wide (16:9)</source>
- <translation type="unfinished"></translation>
+ <translation>Szeroki (16:9)</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Tmpgenc</source>
- <translation type="unfinished"></translation>
+ <translation>Tmpgenc</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -9852,72 +10130,72 @@
 <message>
 <location line="+3"/>
 <source>One thread</source>
- <translation type="unfinished"></translation>
+ <translation>Jeden wątek</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Two threads)</source>
- <translation type="unfinished"></translation>
+ <translation>Dwa wątki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Three threads</source>
- <translation type="unfinished"></translation>
+ <translation>Trzy wątki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Auto (#cpu)</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie (#cpu)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Interlaced</source>
- <translation type="unfinished"></translation>
+ <translation>Z przeplotem</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Top Field First</source>
- <translation type="unfinished"></translation>
+ <translation>Najpierw półobraz górny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Bottom Field First</source>
- <translation type="unfinished"></translation>
+ <translation>Najpierw półobraz dolny</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
+ <translation>Mi_n. kwantyzer:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
+ <translation>Ma_ks. kwantyzer:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Max. quantizer _difference:</source>
- <translation type="unfinished"></translation>
+ <translation>Maks. _różnica kwantyzerów:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>VBV Buffer Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar bufora VBV:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Max bitrate (kb/s):</source>
- <translation type="unfinished"></translation>
+ <translation>Maks. przepływność (kb/s):</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja Trellis</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Number of B frames:</source>
- <translation type="unfinished"></translation>
+ <translation>Ilość klatek typu B:</translation>
 </message>
 <message>
 <location line="+4"/>
@@ -9927,12 +10205,12 @@
 <message>
 <location line="+1"/>
 <source>Aspect ratio:</source>
- <translation type="unfinished"></translation>
+ <translation>Proporcje obrazu:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Matrices:</source>
- <translation type="unfinished"></translation>
+ <translation>Matryce:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -9942,7 +10220,7 @@
 <message>
 <location line="+2"/>
 <source>_Quantizer compression:</source>
- <translation type="unfinished"></translation>
+ <translation>Kompresja kwantyzacji:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -9957,32 +10235,32 @@
 <message>
 <location line="+2"/>
 <source>_Interlaced:</source>
- <translation type="unfinished"></translation>
+ <translation>Z przeplotem:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Field Order:</source>
- <translation type="unfinished"></translation>
+ <translation>Kolejność obszarów:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Basic Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Podstawowe ustawienia</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Adv. Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>libavcodec MPEG-2 configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja libavcodec MPEG-2</translation>
 </message>
 </context>
 <context>
@@ -9990,17 +10268,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Full</source>
- <translation type="unfinished">Pełny</translation>
+ <translation>Pełny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Log</source>
- <translation type="unfinished">Dziennik</translation>
+ <translation>Dziennik</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -10010,42 +10288,42 @@
 <message>
 <location line="+1"/>
 <source>EPZS</source>
- <translation type="unfinished">Algorytm EPZS</translation>
+ <translation type="unfinished">EPZS</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>H.263</source>
- <translation type="unfinished">H.263</translation>
+ <translation>H.263</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
+ <translation>MPEG</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Threading</source>
- <translation type="unfinished">Wątkowanie</translation>
+ <translation>Wątkowanie</translation>
 </message>
 <message>
 <location line="+25"/>
 <source>User Interface</source>
- <translation type="unfinished">Interfejs użytkownika</translation>
+ <translation>Interfejs użytkownika</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Motion Estimation</source>
- <translation type="unfinished">Szacowanie ruchu</translation>
+ <translation>Szacowanie ruchu</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Rate Control</source>
- <translation type="unfinished">Kontrola przepływności</translation>
+ <translation>Kontrola przepływności</translation>
 </message>
 <message>
 <location line="-72"/>
 <source>X1</source>
- <translation type="unfinished"></translation>
+ <translation>X1</translation>
 </message>
 <message>
 <location line="+9"/>
@@ -10065,22 +10343,22 @@
 <message>
 <location line="+3"/>
 <source>One thread</source>
- <translation type="unfinished"></translation>
+ <translation>Jeden wątek</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Two threads)</source>
- <translation type="unfinished"></translation>
+ <translation>Dwa wątki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Three threads</source>
- <translation type="unfinished"></translation>
+ <translation>Trzy wątki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Auto (#cpu)</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie (#cpu)</translation>
 </message>
 <message>
 <location line="+10"/>
@@ -10294,25 +10572,25 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
- <translation type="unfinished"></translation>
+ <translation>Niska jakość</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
- <translation type="unfinished"></translation>
+ <translation>Wysoka jakość</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
- <translation type="unfinished"></translation>
+ <translation>BluRay</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -10336,10 +10614,30 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
+ <translation>Ustawienie:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Profile:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -10347,17 +10645,37 @@
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
+ <translation>Przepływność (kb/s)</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
+ <translation>Maks. przepływność (kb/s):</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10497,39 +10815,99 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
 <source>File error</source>
- <translation type="unfinished">Błąd podczas otwierania pliku</translation>
+ <translation>Błąd pliku</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Cannot open &quot;%s&quot;.</source>
- <translation type="unfinished">Nie można otworzyć &quot;%s&quot;.</translation>
+ <translation>Nie można otworzyć &quot;%s&quot;.</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>%s already exists.
 
 Do you want to replace it?</source>
- <translation type="unfinished"></translation>
+ <translation>%s już istnieje
+
+Czy chcesz go zastąpić?</translation>
 </message>
 <message>
 <location line="+27"/>
 <location line="+14"/>
 <source>It is possible that you are trying to overwrite an input file!</source>
- <translation type="unfinished">Możliwe, że starasz się nadpisać plik wejściowy!</translation>
+ <translation>Możliwe, że próbujesz nadpisać plik wejściowy!</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>Cannot write the file</source>
- <translation type="unfinished">Nie można zapisać pliku</translation>
+ <translation>Nie można zapisać pliku</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>No write access to &quot;%s&quot;.</source>
- <translation type="unfinished">Brak prawa zapisu do &quot;%s&quot;.</translation>
+ <translation>Brak prawa zapisu do &quot;%s&quot;.</translation>
 </message>
 </context>
 <context>
@@ -10580,52 +10958,52 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+162"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Full</source>
- <translation type="unfinished">Pełny</translation>
+ <translation>Pełny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Log</source>
- <translation type="unfinished">Dziennik</translation>
+ <translation>Dziennik</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Phods</source>
- <translation type="unfinished">Algorytm PHODS</translation>
+ <translation>Algorytm PHODS</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>EPZS</source>
- <translation type="unfinished">Algorytm EPZS</translation>
+ <translation>Algorytm EPZS</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>H.263</source>
- <translation type="unfinished">H.263</translation>
+ <translation>H.263</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
+ <translation>MPEG</translation>
 </message>
 <message>
 <location line="+27"/>
 <source>User Interface</source>
- <translation type="unfinished">Interfejs użytkownika</translation>
+ <translation>Interfejs użytkownika</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Rate Control</source>
- <translation type="unfinished">Kontrola przepływności</translation>
+ <translation>Kontrola przepływności</translation>
 </message>
 <message>
 <location line="-42"/>
 <source>X1</source>
- <translation type="unfinished"></translation>
+ <translation>X1</translation>
 </message>
 <message>
 <location line="+9"/>
@@ -10645,52 +11023,52 @@
 <message>
 <location line="+9"/>
 <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
+ <translation>Min. kwantyzer:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
+ <translation>Maks. kwantyzer:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Max. quantizer _difference:</source>
- <translation type="unfinished"></translation>
+ <translation>Maks. różnica kwantyzerów:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja Trellis</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Filesize tolerance (kb):</source>
- <translation type="unfinished"></translation>
+ <translation>Tolerancja rozmiaru pliku (kb):</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Quantizer compression:</source>
- <translation type="unfinished"></translation>
+ <translation>Kompresja kwantyzacji:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Quantizer _blur:</source>
- <translation type="unfinished"></translation>
+ <translation>Rzmycie kwantyzacji:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Gop Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rrozmiar _GOP:</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>libavcodec FLV1 configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja libavcodec FLV1</translation>
 </message>
 </context>
 <context>
@@ -11033,12 +11411,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
 <source>Horizontal Flip</source>
- <translation type="unfinished"></translation>
+ <translation>Odbicie poziome</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Horizontally flip the image.</source>
- <translation type="unfinished"></translation>
+ <translation>Obróć obraz w poziomie.</translation>
 </message>
 </context>
 <context>
@@ -11047,42 +11425,42 @@
 <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+56"/>
 <location line="+75"/>
 <source>No data</source>
- <translation type="unfinished">Brak danych</translation>
+ <translation>Brak danych</translation>
 </message>
 <message>
 <location line="+71"/>
 <source>Max. bitrate:</source>
- <translation type="unfinished">Maks. przepływność:</translation>
+ <translation>Maks. przepływność:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Average bitrate:</source>
- <translation type="unfinished">Średnia przepływność:</translation>
+ <translation>Średnia przepływność:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Number of I frames:</source>
- <translation type="unfinished">Ilość klatek typu I</translation>
+ <translation>Ilość klatek typu I:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Number of P frames:</source>
- <translation type="unfinished">Ilość klatek typu P</translation>
+ <translation>Ilość klatek typu P:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Number of B frames:</source>
- <translation type="unfinished">Ilość klatek typu B</translation>
+ <translation>Ilość klatek typu B:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Max. B frames:</source>
- <translation type="unfinished">Maksymalna ilość klatek typu B:</translation>
+ <translation>Maksymalna ilość klatek typu B:</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>Bitrate Histogram</source>
- <translation type="unfinished">Histogram przepływności</translation>
+ <translation>Histogram przepływności</translation>
 </message>
 </context>
 <context>
@@ -11090,12 +11468,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
 <source>Adjust hue and saturation.</source>
- <translation type="unfinished">Dostosuj odcień i nasycenie</translation>
+ <translation>Dostosuj odcień i nasycenie.</translation>
 </message>
 <message>
 <location line="-1"/>
 <source>Mplayer Hue</source>
- <translation type="unfinished"></translation>
+ <translation>Mplayer Hue</translation>
 </message>
 </context>
 <context>
@@ -11104,12 +11482,12 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui" line="+14"/>
 <location line="+45"/>
 <source>Hue</source>
- <translation type="unfinished">Odcień</translation>
+ <translation>Odcień</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Saturation</source>
- <translation type="unfinished"></translation>
+ <translation>Saturacja</translation>
 </message>
 </context>
 <context>
@@ -11117,22 +11495,22 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
 <source>HUFFYUV</source>
- <translation type="unfinished"></translation>
+ <translation>HUFFYUV</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>FF HUFFYUV</source>
- <translation type="unfinished"></translation>
+ <translation>FF HUFFYUV</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Type:</source>
- <translation type="unfinished"></translation>
+ <translation>Typ:</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>HuffYUV Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja HuffYUV</translation>
 </message>
 </context>
 <context>
@@ -11153,22 +11531,22 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
 <source>Continue indexing</source>
- <translation type="unfinished"></translation>
+ <translation>Kontynuuj indeksowanie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Abort Requested</source>
- <translation type="unfinished"></translation>
+ <translation>Żądanie przerwania</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Do you want to abort indexing ?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz przerwać indeksowanie?</translation>
 </message>
 <message>
 <location line="+76"/>
 <source>Time Left :%02d:%02d:%02d</source>
- <translation type="unfinished"></translation>
+ <translation>Pozostały czas: %02d:%02d:%02d</translation>
 </message>
 </context>
 <context>
@@ -11176,59 +11554,59 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
 <source>Remove IVTC dupe.</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń duplikaty IVTC</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Remove the duplicate frames present after ivtc.</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń zduplikowane ramki obecne po IVTC.</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
 <source>_Noise:</source>
- <translation type="unfinished">_Szum:</translation>
+ <translation>_Szum:</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
 <source>_Show:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Wyświetl informacje na wideo</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Remove duplicate:</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń duplikat:</translation>
 </message>
 <message>
 <location line="+4"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
 <source>Full</source>
- <translation type="unfinished">Pełny</translation>
+ <translation>Pełna</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
 <source>Fast</source>
- <translation type="unfinished">Szybki</translation>
+ <translation>Szybko</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
 <source>VeryFast</source>
- <translation type="unfinished"></translation>
+ <translation>Bardzo szybko</translation>
 </message>
 <message>
 <location line="+5"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
 <source>_Frame rate change:</source>
- <translation type="unfinished">Zmiana liczby _klatek na sekundę:</translation>
+ <translation>Zmiana liczby _klatek na sekundę:</translation>
 </message>
 <message>
 <location line="+3"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
 <source>DupeRemover</source>
- <translation type="unfinished"></translation>
+ <translation>Usuwanie duplikatów</translation>
 </message>
 </context>
 <context>
@@ -11236,42 +11614,42 @@
 <message>
 <location filename="../../common/GUI_jobs.cpp" line="+37"/>
 <source>Oops</source>
- <translation type="unfinished">Oops</translation>
+ <translation>Oops</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Something very wrong happened when building joblist.</source>
- <translation type="unfinished">Coś bardzo złego stało się podczas tworzenia listy zadań.</translation>
+ <translation>Coś bardzo złego stało się podczas tworzenia listy zadań.</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>There are no jobs stored</source>
- <translation type="unfinished">Nie ma więcej zadań</translation>
+ <translation>Nie ma więcej zadań</translation>
 </message>
 <message>
 <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
 <source>Avidemux Jobs</source>
- <translation type="unfinished"></translation>
+ <translation>Zadania Avidemux</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>Run all pending jobs</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom wszystkie oczekujące zadania</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Run jobs</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom zadania</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Delete already executed jobs</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń już uruchomione zadania</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Cleanup</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -11280,13 +11658,17 @@
 </message>
 <message>
 <location line="+3"/>
+ <source>use Qt version</source>
+ <translation>użyj wersję Qt</translation>
+ </message>
+ <message>
 <source>use QT4 version</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">użyj wersję QT4</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjście</translation>
 </message>
 </context>
 <context>
@@ -11294,27 +11676,27 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
 <source>Jobs</source>
- <translation type="unfinished">Zadania</translation>
+ <translation>Zadania</translation>
 </message>
 <message>
 <location line="+44"/>
 <source>Delete All Jobs</source>
- <translation type="unfinished">Usuń wszystkie zadania</translation>
+ <translation>Usuń wszystkie zadania</translation>
 </message>
 <message>
 <location line="-7"/>
 <source>Delete Sel. Job</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń zaznaczone zadania</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Run All Jobs</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom wszystkie zadania</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Run Selected Job</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom zaznaczone zadania</translation>
 </message>
 </context>
 <context>
@@ -11353,27 +11735,27 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
 <source>_Quantizer:</source>
- <translation type="unfinished">_Kwantyzator:</translation>
+ <translation>_Kwantyzator:</translation>
 </message>
 <message>
 <location line="-12"/>
 <source>YUV422</source>
- <translation type="unfinished"></translation>
+ <translation>YUV422</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>YUV420</source>
- <translation type="unfinished"></translation>
+ <translation>YUV420</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>_ColorSpace:</source>
- <translation type="unfinished"></translation>
+ <translation>Przestrzeń barw:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Mjpeg Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja Mjpeg</translation>
 </message>
 </context>
 <context>
@@ -11432,67 +11814,67 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="+65"/>
 <source>Top</source>
- <translation type="unfinished">Góra</translation>
+ <translation>Góra</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Bottom</source>
- <translation type="unfinished">Dół</translation>
+ <translation>Dół</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>_Field order:</source>
- <translation type="unfinished">Kolejność _pól:</translation>
+ <translation>Kolejność _pól:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Threshold:</source>
- <translation type="unfinished">_Próg:</translation>
+ <translation>_Próg:</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Smaller means more deinterlacing</source>
- <translation type="unfinished">Niższy oznacza większy przeplot</translation>
+ <translation>Niższy oznacza większe usuwanie przeplotu</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Sharp</source>
- <translation type="unfinished">O_stry</translation>
+ <translation>O_strość</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>_Sharper engine:</source>
- <translation type="unfinished">_Ostrzejszy silnik</translation>
+ <translation>Silnik wyostrzania:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>T_woway</source>
- <translation type="unfinished">D_wustronny</translation>
+ <translation>D_wustronny</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Extrapolate better (better not to use it)</source>
- <translation type="unfinished">Użyj lepszej ekstrapolacji (lepiej nie używać)</translation>
+ <translation>Użyj lepszej ekstrapolacji (lepiej nie używać)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Map</source>
- <translation type="unfinished">_Mapa</translation>
+ <translation>_Mapa</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Show interlaced areas (for test!)</source>
- <translation type="unfinished">Pokaż obszary z przeplotem (do testu!)</translation>
+ <translation>Pokaż obszary z przeplotem (do testu!)</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>KernelDeint</source>
- <translation type="unfinished">KernelDeint</translation>
+ <translation>KernelDeint</translation>
 </message>
 <message>
 <location line="-28"/>
 <source>Kernel Deint.</source>
- <translation type="unfinished"></translation>
+ <translation>Kernel deinterlacer</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -11505,12 +11887,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+310"/>
 <source>CBR</source>
- <translation type="unfinished">CBR</translation>
+ <translation>CBR</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>ABR</source>
- <translation type="unfinished">ABR</translation>
+ <translation>ABR</translation>
 </message>
 <message>
 <location line="+2"/>
@@ -11520,12 +11902,12 @@
 <message>
 <location line="+18"/>
 <source>_Bitrate:</source>
- <translation type="unfinished">_Przepływność:</translation>
+ <translation>_Przepływność:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Quality:</source>
- <translation type="unfinished">_Jakość:</translation>
+ <translation>_Jakość:</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -11562,7 +11944,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+71"/>
 <source>_Process luma</source>
- <translation type="unfinished">_Przetwarzanie luminancji</translation>
+ <translation>_Przetwarzanie luminancji</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -11572,7 +11954,7 @@
 <message>
 <location line="+1"/>
 <source>P_rocess chroma</source>
- <translation type="unfinished">P_rzetwarzanie chrominancji</translation>
+ <translation>P_rzetwarzanie chrominancji</translation>
 </message>
 <message>
 <location line="+4"/>
@@ -11641,7 +12023,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
 <source>_Bitrate:</source>
- <translation type="unfinished">_Przepływność:</translation>
+ <translation>_Przepływność:</translation>
 </message>
 </context>
 <context>
@@ -11649,17 +12031,17 @@
 <message>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
 <source>_Swap U and V</source>
- <translation type="unfinished">_Zamień U i V</translation>
+ <translation>_Zamień U i V</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Show motion _vectors</source>
- <translation type="unfinished">Pokaż _wektory ruchu</translation>
+ <translation>Pokaż _wektory ruchu</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Decoder Options</source>
- <translation type="unfinished">Opcje dekodera</translation>
+ <translation>Opcje dekodera</translation>
 </message>
 </context>
 <context>
@@ -11667,52 +12049,53 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+188"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Linear blend</source>
- <translation type="unfinished">Przenikanie liniowe</translation>
+ <translation>Przenikanie liniowe</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Linear interpolate</source>
- <translation type="unfinished">Interpolacja liniowa</translation>
+ <translation>Interpolacja liniowa</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Cubic interpolate</source>
- <translation type="unfinished">Interpolacja sześcienna</translation>
+ <translation>Interpolacja sześcienna</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Median interpolate</source>
- <translation type="unfinished">Interpolacja mediana</translation>
+ <translatorcomment>medianą czy medianowa?</translatorcomment>
+ <translation>Interpolacja medianą</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>FFmpeg deint</source>
- <translation type="unfinished">FFmpeg deint</translation>
+ <translation>Usuwanie przeplotu FFmpeg</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>_Deinterlacing:</source>
- <translation type="unfinished">_Usuwanie przeplotu:</translation>
+ <translation>_Usuwanie przeplotu:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Autolevel</source>
- <translation type="unfinished">_Automatyczny poziom</translation>
+ <translation>_Automatyczny poziom</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>libavcodec deinterlacer</source>
- <translation type="unfinished">Narzędzie usuwania przeplotu libavcodec</translation>
+ <translation>Usuwanie przeplotu libavcodec</translation>
 </message>
 <message>
 <location line="-131"/>
 <source>Libavdec Deinterlacers</source>
- <translation type="unfinished"></translation>
+ <translation>Usuwanie przeplotu Libavdec</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -11725,12 +12108,12 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
 <source>License</source>
- <translation type="unfinished"></translation>
+ <translation>Licencja</translation>
 </message>
 <message>
 <location line="+46"/>
 <source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
 </message>
 </context>
 <context>
@@ -11762,17 +12145,22 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+22"/>
 <source>Add logo</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj logo</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Put a logo on top of video, with alpha blending.</source>
- <translation type="unfinished"></translation>
+ <translation>Umieść logo na wierzchu wideo, stosując alpha blending.</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
 <source>Select Logo Image</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz obraz logo</translation>
+ </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation> s</translation>
 </message>
 </context>
 <context>
@@ -11780,43 +12168,43 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+14"/>
 <source>Logo</source>
- <translation type="unfinished">Logo</translation>
+ <translation>Logo</translation>
 </message>
 <message>
 <location line="+10"/>
 <location line="+7"/>
 <source>Image</source>
- <translation type="unfinished"></translation>
+ <translation>Obraz</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Select</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz</translation>
 </message>
 <message>
 <location line="+26"/>
 <source>X</source>
- <translation type="unfinished"></translation>
+ <translation>X</translation>
 </message>
 <message>
 <location line="+17"/>
 <source>Y</source>
- <translation type="unfinished"></translation>
+ <translation>Y</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
- <translation type="unfinished"></translation>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
+ <translation>Możesz kliknąć obraz, aby w przybliżeniu umiejscowić logo</translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
- <translation type="unfinished"></translation>
+ <location line="-85"/>
+ <source>Alpha</source>
+ <translation>Przenikanie</translation>
 </message>
 </context>
 <context>
@@ -11824,12 +12212,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
 <source>GreyScale</source>
- <translation type="unfinished"></translation>
+ <translation>Skala szarości</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Remove color, only key grey image.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Usuń kolor, pozostaw tylko obraz w skali szarości.</translation>
 </message>
 </context>
 <context>
@@ -11837,67 +12225,67 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+20"/>
 <source>Video Filter Manager</source>
- <translation type="unfinished">Zarządca filtrów obrazu wideo</translation>
+ <translation>Menedżer filtrów wideo</translation>
 </message>
 <message>
 <location line="+189"/>
 <source>Interlacing</source>
- <translation type="unfinished">Przeplot</translation>
+ <translation>Przeplot</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Colors</source>
- <translation type="unfinished">Kolory</translation>
+ <translation>Kolory</translation>
 </message>
 <message>
 <location line="+27"/>
 <source>Subtitles</source>
- <translation type="unfinished">Napisy</translation>
+ <translation>Napisy</translation>
 </message>
 <message>
 <location line="+18"/>
 <source>Miscellaneous</source>
- <translation type="unfinished">Różne</translation>
+ <translation>Różne</translation>
 </message>
 <message>
 <location line="-182"/>
 <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;big&gt;&lt;b&gt;Aktywne filtry&lt;/b&gt;&lt;/big&gt;</translation>
 </message>
 <message>
 <location line="+78"/>
 <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;big&gt;&lt;b&gt;Dostępne filtry&lt;/b&gt;&lt;/big&gt;</translation>
 </message>
 <message>
 <location line="+41"/>
 <source>Transform</source>
- <translation type="unfinished"></translation>
+ <translation>Transformacja</translation>
 </message>
 <message>
 <location line="+27"/>
 <source>Noise</source>
- <translation type="unfinished"></translation>
+ <translation>Szum</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Sharpness</source>
- <translation type="unfinished"></translation>
+ <translation>Wyostrzenie</translation>
 </message>
 <message>
 <location line="+18"/>
 <source>OpenGl</source>
- <translation type="unfinished"></translation>
+ <translation>OpenGL</translation>
 </message>
 <message>
 <location line="+60"/>
 <source>&amp;Preview</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Podgląd</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>&amp;Close</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Zamknij</translation>
 </message>
 </context>
 <context>
@@ -11924,12 +12312,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
 <source>Matroska Images</source>
- <translation type="unfinished"></translation>
+ <translation>Obrazy Matroska</translation>
 </message>
 <message>
 <location line="+426"/>
 <source>Matroska clusters</source>
- <translation type="unfinished"></translation>
+ <translation>Klastry Matroska</translation>
 </message>
 </context>
 <context>
@@ -11937,7 +12325,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+82"/>
 <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
- <translation type="unfinished">Narzędzie usuwania przeplotu z kompensacją ruchu. Przeniesione z MPlayera</translation>
+ <translation>Narzędzie usuwania przeplotu z kompensacją ruchu. Przeniesione z MPlayera.</translation>
 </message>
 <message>
 <location line="+38"/>
@@ -11962,12 +12350,12 @@
 <message>
 <location line="+3"/>
 <source>_Mode:</source>
- <translation type="unfinished">_Tryb:</translation>
+ <translation>_Tryb:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Qp:</source>
- <translation type="unfinished">_Qp:</translation>
+ <translation>_Qp:</translation>
 </message>
 <message>
 <location line="+4"/>
@@ -12016,35 +12404,40 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
 <source>Merge Fields</source>
- <translation type="unfinished"></translation>
+ <translation>Merge Fields</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Merge two pictures as if they were two fields.</source>
- <translation type="unfinished">Połącz dwa obrazy jakby były dwoma polami.</translation>
+ <translation>Łączy dwa obrazy jakby były dwoma obszarami.</translation>
 </message>
 </context>
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisywanie MKV</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
- <translation type="unfinished"></translation>
+ <translation>Wymuś szerokość wyświetlania</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Display width</source>
+ <translation>Szerokość wyświetlania</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+7"/>
 <source>MKV Muxer</source>
- <translation type="unfinished"></translation>
+ <translation>Mukser MKV</translation>
 </message>
 </context>
 <context>
@@ -12052,12 +12445,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
 <source>_Spatial luma strength:</source>
- <translation type="unfinished">Natężenie luminancji prze_strzennej:</translation>
+ <translation>Natężenie luminancji prze_strzennej:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>S_patial chroma strength:</source>
- <translation type="unfinished">Natężenie _przestrzenne chrominancji:</translation>
+ <translation>Natężenie _przestrzenne chrominancji:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -12072,7 +12465,7 @@
 <message>
 <location line="+4"/>
 <source>MPlayer Denoise 3D HQ</source>
- <translation type="unfinished"></translation>
+ <translation>Usuwanie szumu MPlayer Denoise 3D HQ</translation>
 </message>
 <message>
 <source>MPlayer denoise3d</source>
@@ -12081,7 +12474,7 @@
 <message>
 <location line="-40"/>
 <source>Mplayer Denoise 3D HQ</source>
- <translation type="unfinished"></translation>
+ <translation>Usuwanie szumu MPlayer Denoise 3D HQ</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -12129,9 +12522,9 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
- <translation type="unfinished">Wystąpił problem podczas czytania nagłówków SVQ3</translation>
+ <translation>Wystąpił problem podczas czytania nagłówków SVQ3</translation>
 </message>
 <message>
 <source>No stts table</source>
@@ -12141,10 +12534,10 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
- <translation type="unfinished">Niewspierane</translation>
+ <translation>Nie wspierane</translation>
 </message>
 <message>
 <location line="-9"/>
@@ -12157,29 +12550,39 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisywanie MP4</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Saving PSP</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisywanie PSP</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
- <translation type="unfinished"></translation>
+ <translation>Format muksowania</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Use alternate MP3 tag</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj alternatywnej etykiety pliku MP3</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation>Wymuś proporcje obrazu</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation>Proporcje obrazu (DAR)</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
- <translation type="unfinished"></translation>
+ <translation>Mukser MP4</translation>
 </message>
 </context>
 <context>
@@ -12187,22 +12590,22 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
 <source>Audio</source>
- <translation type="unfinished">Dźwięk</translation>
+ <translation>Dźwięk</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Audio format not supported, only AAC/MP3/AC3</source>
- <translation type="unfinished"></translation>
+ <translation>Format dźwięku nie wspierany; tylko AAC/MP3/AC3</translation>
 </message>
 <message>
 <location line="+46"/>
 <source>Saving</source>
- <translation type="unfinished">Zapisywanie</translation>
+ <translation>Zapisywanie</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Video</source>
- <translation type="unfinished">Obraz</translation>
+ <translation>Obraz</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -12217,17 +12620,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+53"/>
 <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
- <translation type="unfinished"></translation>
+ <translation>Nieprawidłowa częstotliwość dla AC3. Dozwolone 32, 44.1 i 48 kHz</translation>
 </message>
 <message>
 <location line="+19"/>
 <source>Invalid bitrate for AC3</source>
- <translation type="unfinished"></translation>
+ <translation>Nieprawidłowa przepływność dla AC3</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>Invalid number of channels for AC3</source>
- <translation type="unfinished"></translation>
+ <translation>Nieprawidłowa liczba kanałów dla AC3</translation>
 </message>
 <message>
 <location line="+48"/>
@@ -12257,52 +12660,52 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+14"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+14"/>
 <source>Mplayer Delogo</source>
- <translation type="unfinished"></translation>
+ <translation>Mplayer Delogo</translation>
 </message>
 <message>
 <location line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+32"/>
 <source>X</source>
- <translation type="unfinished"></translation>
+ <translation>X</translation>
 </message>
 <message>
 <location line="+20"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+37"/>
 <source>Y</source>
- <translation type="unfinished"></translation>
+ <translation>Y</translation>
 </message>
 <message>
 <location line="+23"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-17"/>
 <source>Width</source>
- <translation type="unfinished"></translation>
+ <translation>Szerokość</translation>
 </message>
 <message>
 <location line="+20"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+7"/>
 <source>Height</source>
- <translation type="unfinished"></translation>
+ <translation>Wysokość</translation>
 </message>
 <message>
 <location line="+20"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-14"/>
 <source>Border Width</source>
- <translation type="unfinished"></translation>
+ <translation>Szerokość obramowania</translation>
 </message>
 <message>
 <location line="+50"/>
 <source>Preview. Click in the image above to coarsly set the box coordinates</source>
- <translation type="unfinished"></translation>
+ <translation>Podgląd. Kliknij powyższy obrazek, aby zgrubnie ustawić współrzędne bloku</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+59"/>
 <source>You can resize the red rectangle using the grips </source>
- <translation type="unfinished"></translation>
+ <translation>Możesz zmienić rozmiar czerwonego prostokąta za pomocą uchwytów</translation>
 </message>
 <message>
 <location line="+58"/>
 <source>Preview</source>
- <translation type="unfinished"></translation>
+ <translation>Podgląd</translation>
 </message>
 </context>
 <context>
@@ -12310,7 +12713,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
 <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
- <translation type="unfinished">Wyostrz krawędzie bez zwiększania szumu. Od Donalda Grafta</translation>
+ <translation>Wyostrzanie krawędzi bez wzmacniania szumów. Od Donalda Grafta.</translation>
 </message>
 <message>
 <source>_Mask</source>
@@ -12335,7 +12738,7 @@
 <message>
 <location line="-1"/>
 <source>Msharpen</source>
- <translation type="unfinished"></translation>
+ <translation>Msharpen</translation>
 </message>
 </context>
 <context>
@@ -12343,27 +12746,27 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+14"/>
 <source>MSharpen</source>
- <translation type="unfinished"></translation>
+ <translation>Msharpen</translation>
 </message>
 <message>
 <location line="+63"/>
 <source>Mask</source>
- <translation type="unfinished"></translation>
+ <translation>Maska</translation>
 </message>
 <message>
 <location line="+37"/>
 <source>Strength</source>
- <translation type="unfinished"></translation>
+ <translation>Natężenie</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Threshold</source>
- <translation type="unfinished"></translation>
+ <translation>Próg</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>HighQuality</source>
- <translation type="unfinished"></translation>
+ <translation>Wysoka jakość</translation>
 </message>
 </context>
 <context>
@@ -12371,22 +12774,22 @@
 <message>
 <location filename="../../common/gui_navigate.cpp" line="+244"/>
 <source>Cannot go to next keyframe</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przejść do następnej klatki kluczowej</translation>
 </message>
 <message>
 <location line="+69"/>
 <source>Cannot go to previous keyframe</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można przejść do poprzedniej klatki kluczowej</translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 </context>
 <context>
@@ -12417,17 +12820,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+136"/>
 <source>Low Quality</source>
- <translation type="unfinished"></translation>
+ <translation>Niska jakość</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>High Quality</source>
- <translation type="unfinished"></translation>
+ <translation>Wysoka jakość</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>BluRay</source>
- <translation type="unfinished"></translation>
+ <translation>BluRay</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -12447,22 +12850,22 @@
 <message>
 <location line="+7"/>
 <source>Preset:</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienie:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
+ <translation>Przepływność (kb/s):</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
+ <translation>Maks. przepływność (kb/s):</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Nvidia H264 Encoder configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja kodera NVidia H264</translation>
 </message>
 </context>
 <context>
@@ -12481,37 +12884,37 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
- <translation type="unfinished">Zdeformowany nagłówek</translation>
+ <translation>Zdeformowany nagłówek</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
 <source>Unpacking bitstream</source>
- <translation type="unfinished">Rozpakowanie strumienia bitów</translation>
+ <translation>Rozpakowanie strumienia bitów</translation>
 </message>
 </context>
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
- <translation type="unfinished"></translation>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
+ <translation>Czas początkowy (ms):</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
- <translation type="unfinished"></translation>
+ <source>_End time:</source>
+ <translation>Czas końcowy:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Configure filter</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguruj filtr</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Partial Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr częściowy</translation>
 </message>
 </context>
 <context>
@@ -12526,12 +12929,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
 <source>PrintInfo</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetl info</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Display some informations on Screen.</source>
- <translation type="unfinished"></translation>
+ <translation>Wyświetl trochę informacji na ekranie.</translation>
 </message>
 </context>
 <context>
@@ -12558,38 +12961,38 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+14"/>
 <source>Properties</source>
- <translation type="unfinished">Właściwości</translation>
+ <translation>Właściwości</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Video</source>
- <translation type="unfinished">Obraz</translation>
+ <translation>Obraz</translation>
 </message>
 <message>
 <location line="+31"/>
 <source>Frame Rate:</source>
- <translation type="unfinished">Liczba klatek na sekundę:</translation>
+ <translation>Liczba klatek/sekundę:</translation>
 </message>
 <message>
 <location line="+14"/>
 <location line="+135"/>
 <source>Total Duration:</source>
- <translation type="unfinished">Całkowity czas trwania: </translation>
+ <translation>Całkowity czas trwania:</translation>
 </message>
 <message>
 <location line="-121"/>
 <source>Aspect Ratio:</source>
- <translation type="unfinished">Proporcje obrazu:</translation>
+ <translation>Proporcje obrazu:</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Image Size:</source>
- <translation type="unfinished">Rozmiar obrazu:</translation>
+ <translation>Rozmiar obrazu:</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Codec 4CC:</source>
- <translation type="unfinished">Kod 4CC kodeka:</translation>
+ <translation>Kod 4CC kodeka:</translation>
 </message>
 <message>
 <source>Global Motion Compensation:</source>
@@ -12606,7 +13009,7 @@
 <message>
 <location line="+62"/>
 <source>Audio</source>
- <translation type="unfinished">Dźwięk</translation>
+ <translation>Dźwięk</translation>
 </message>
 <message>
 <source>File Size:</source>
@@ -12615,27 +13018,27 @@
 <message>
 <location line="+38"/>
 <source>Frequency:</source>
- <translation type="unfinished">Częstotliwość:</translation>
+ <translation>Częstotliwość:</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Variable Bitrate:</source>
- <translation type="unfinished">Zmienna przepływność:</translation>
+ <translation>Zmienna przepływność:</translation>
 </message>
 <message>
 <location line="+21"/>
 <source>Bitrate:</source>
- <translation type="unfinished">Przepływność:</translation>
+ <translation>Przepływność:</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Channels:</source>
- <translation type="unfinished">Kanały:</translation>
+ <translation>Kanały:</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Codec:</source>
- <translation type="unfinished">Kodek:</translation>
+ <translation>Kodek:</translation>
 </message>
 <message>
 <location line="-226"/>
@@ -12649,35 +13052,35 @@
 <message>
 <location line="+17"/>
 <source>Extra Video Properties</source>
- <translation type="unfinished"></translation>
+ <translation>Dodatkowe właściwości wideo</translation>
 </message>
 <message>
 <location line="+28"/>
 <source>ExtraDataSize:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar dodatkowych danych:</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Extra data :</source>
- <translation type="unfinished"></translation>
+ <translation>Dodatkowe dane:</translation>
 </message>
 <message>
 <location line="+123"/>
 <source>Copy to Clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Kopiuj do schowka</translation>
 </message>
 <message>
 <location line="+29"/>
 <source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
 </message>
 </context>
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -12688,7 +13091,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
 <source>Indexing</source>
- <translation type="unfinished">Indeksowanie</translation>
+ <translation>Indeksowanie</translation>
 </message>
 <message>
 <location line="+41"/>
@@ -12701,48 +13104,48 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
 <source>Select audio file</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik dźwiękowy</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można użyć tego pliku jako ścieżkę dźwiękową</translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
- <translation type="unfinished"></translation>
+ <translation>Niektóre ścieżki są używane wielokrotnie</translation>
 </message>
 <message>
 <location line="+126"/>
 <source>Track </source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka </translation>
 </message>
 <message>
 <location line="+0"/>
 <source> from video</source>
- <translation type="unfinished"></translation>
+ <translation> z wideo</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>File </source>
- <translation type="unfinished"></translation>
+ <translation>Plik </translation>
 </message>
 <message>
 <location line="+34"/>
 <source>.... Add audio track</source>
- <translation type="unfinished"></translation>
+ <translation>.... Dodaj ścieżkę dźwiękową</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
- <translation type="unfinished"></translation>
+ <translation>kopiuj</translation>
 </message>
 </context>
 <context>
@@ -12751,43 +13154,43 @@
 <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+65"/>
 <location line="+20"/>
 <source>Privileges Required</source>
- <translation type="unfinished">Wymagane uprawnienia</translation>
+ <translation>Wymagane uprawnienia</translation>
 </message>
 <message>
 <location line="-20"/>
 <location line="+20"/>
 <source>Root privileges are required to perform this operation.</source>
- <translation type="unfinished">Aby wykonać to działanie wymagane są uprawnienia administracyjne.</translation>
+ <translation>Aby wykonać to działanie wymagane są uprawnienia administracyjne.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
- <translation type="unfinished"></translation>
+ <translation>Pierwszy przebieg</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Pass 1</source>
- <translation type="unfinished"></translation>
+ <translation>Przebieg 1</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Encoding...</source>
- <translation type="unfinished"></translation>
+ <translation>Kodowanie...</translation>
 </message>
 <message>
 <location line="+188"/>
 <source>The encoding is paused. Do you want to resume or abort?</source>
- <translation type="unfinished"></translation>
+ <translation>Kodowanie jest wstrzymane. Chcesz je wznowić, czy przerwać?</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Resume</source>
- <translation type="unfinished">Wznów</translation>
+ <translation>Wznów</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Abort</source>
- <translation type="unfinished">Przerwij</translation>
+ <translation>Przerwij</translation>
 </message>
 </context>
 <context>
@@ -12796,18 +13199,18 @@
 <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
 <location line="+139"/>
 <source>All files (*.*)</source>
- <translation type="unfinished"></translation>
+ <translation>Wszystkie pliki (*.*)</translation>
 </message>
 <message>
 <location line="-54"/>
 <location line="+96"/>
 <source> files (*.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished"> pliki (*.</translation>
 </message>
 <message>
 <location line="-68"/>
 <source>Overwrite file </source>
- <translation type="unfinished"></translation>
+ <translation>Zastąp plik </translation>
 </message>
 </context>
 <context>
@@ -12815,98 +13218,99 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
 <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>
+ <translation>&lt;b&gt;Dostępna jest nowa wersja&lt;/b&gt;&lt;br&gt;Wersja %1&lt;br&gt;Wydana %2&lt;br&gt;Możesz pobrać ją tutaj:&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Możesz wyłączyć automatyczne aktualizacje w preferencjach.&lt;/small&gt;</translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnie pliki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Recent Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnie projekty</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
- <translation type="unfinished"></translation>
+ <translation>Odtwórz/Zatrzymaj</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Go to previous frame</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia klatka</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Go to next frame</source>
- <translation type="unfinished"></translation>
+ <translation>Następna klatka</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Go to previous keyframe</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzednia klatka kluczowa</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Go to next keyframe</source>
- <translation type="unfinished"></translation>
+ <translation>Następna klatka kluczowa</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Set start marker</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw znacznik początkowy</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Set end marker</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw znacznik końcowy</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Go to first frame</source>
- <translation type="unfinished"></translation>
+ <translation>Pierwsza klatka</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Go to last frame</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnia klatka</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Go to marker A</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do znacznika A</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Go to marker B</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do znacznika B</translation>
 </message>
 <message>
 <location line="+16"/>
 <source>Backward one minute</source>
- <translation type="unfinished"></translation>
+ <translation>Do tyłu jedna minuta</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Forward one minute</source>
- <translation type="unfinished"></translation>
+ <translation>Do przodu jedna minuta</translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja napotkała fatalny problem!
+Bieżąca edycja została zapisana i zostanie ponownie załadowana przy następnym uruchomieniu</translation>
 </message>
 <message>
 <location line="+262"/>
 <source>%c-%s (%02d)</source>
- <translation type="unfinished"></translation>
+ <translation>%c-%s (%02d)</translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
- <translation type="unfinished"></translation>
+ <translation> (ścieżki: %d)</translation>
 </message>
 </context>
 <context>
@@ -12914,37 +13318,37 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+51"/>
 <source>Project Script</source>
- <translation type="unfinished"></translation>
+ <translation>Skrypt projektu</translation>
 </message>
 <message>
 <location line="+4"/>
 <source> Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>&amp;Run Project...</source>
- <translation type="unfinished"></translation>
+ <translation>U&amp;ruchom projekt...</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>&amp;Debug Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Debuguj projekt...</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Save &amp;As Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz projekt jako...</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Scripting Shell</source>
- <translation type="unfinished"></translation>
+ <translation>Powłoka skryptowa</translation>
 </message>
 <message>
 <location line="+4"/>
 <source> Shell</source>
- <translation type="unfinished"></translation>
+ <translation>Powłoka</translation>
 </message>
 <message>
 <location line="+22"/>
@@ -12962,83 +13366,83 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
 <source>Ready</source>
- <translation type="unfinished">Gotowe</translation>
+ <translation>Gotowe</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Succeeded</source>
- <translation type="unfinished">Sukces!</translation>
+ <translation>Sukces</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Failed</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Niepowodzenie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Deleted</source>
- <translation type="unfinished">Usunięte</translation>
+ <translation>Usunięte</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Running</source>
- <translation type="unfinished">Uruchomiony</translation>
+ <translation>Uruchomiony</translation>
 </message>
 <message>
 <location line="+24"/>
 <source>Job Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa zadania</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Start Time</source>
- <translation type="unfinished"></translation>
+ <translation>Czas rozpoczęcia</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>End Time</source>
- <translation type="unfinished"></translation>
+ <translation>Czas zakończenia</translation>
 </message>
 <message>
 <location line="+64"/>
 <location line="+14"/>
 <source>Sure!</source>
- <translation type="unfinished">Na pewno!</translation>
+ <translation>Na pewno!</translation>
 </message>
 <message>
 <location line="-14"/>
 <source>Delete job</source>
- <translation type="unfinished">Usuń zadanie</translation>
+ <translation>Usuń zadanie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Are you sure you want to delete %s job?</source>
- <translation type="unfinished"></translation>
+ <translation>Na pewno chcesz usunąć zadanie %s?</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Delete *all* job</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń *wszystkie* zadania</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Are you sure you want to delete ALL jobs?</source>
- <translation type="unfinished"></translation>
+ <translation>Na pewno chcesz usunąć WSZYSTKIE zadania?</translation>
 </message>
 <message>
 <location line="+24"/>
 <source>Already done</source>
- <translation type="unfinished"></translation>
+ <translation>Już zrobione</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>This script has already been successfully executed.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten skrypt został już pomyślnie wykonany.</translation>
 </message>
 </context>
 <context>
@@ -13052,54 +13456,54 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
- <translation type="unfinished">Częściowo</translation>
+ <translation>Częściowy</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>This filter cannot be made partial</source>
- <translation type="unfinished"></translation>
+ <translation>Ten filtr nie może zostać zastosowany częściowo</translation>
 </message>
 <message>
 <location line="+244"/>
 <source>Add</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj</translation>
 </message>
 <message>
 <location line="-96"/>
 <source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń</translation>
 </message>
 <message>
 <location line="-1"/>
 <source>Configure</source>
- <translation type="unfinished">Konfiguruj</translation>
+ <translation>Konfiguruj</translation>
 </message>
 <message>
 <location line="-2"/>
 <source>Move up</source>
- <translation type="unfinished"></translation>
+ <translation>Przesuń w górę</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Move down</source>
- <translation type="unfinished"></translation>
+ <translation>Przesuń w dół</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Make partial</source>
- <translation type="unfinished"></translation>
+ <translation>Zastosuj częściowo</translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
- <translation type="unfinished"></translation>
+ <translation>Wczytaj filtry wideo...</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>Save video filters..</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz filtry wideo...</translation>
 </message>
 </context>
 <context>
@@ -13107,137 +13511,137 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+66"/>
 <source>Unknown</source>
- <translation type="unfinished">Nieznany</translation>
+ <translation>Nieznany</translation>
 </message>
 <message>
 <location line="+94"/>
 <source>_Resume</source>
- <translation type="unfinished"></translation>
+ <translation>Wznów</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>The processing is paused.</source>
- <translation type="unfinished"></translation>
+ <translation>Przetwarzanie jest wstrzymane.</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Cancel it ?</source>
- <translation type="unfinished"></translation>
+ <translation>Przerwać to?</translation>
 </message>
 </context>
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
- <translation type="unfinished">Nie</translation>
+ <translation>Nie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Yes</source>
- <translation type="unfinished">Tak</translation>
+ <translation>Tak</translation>
 </message>
 <message>
 <location line="+75"/>
 <source>Mono</source>
- <translation type="unfinished">Mono</translation>
+ <translation>Mono</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Stereo</source>
- <translation type="unfinished">Stereo</translation>
+ <translation>Stereo</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
- <translation type="unfinished"></translation>
+ <translation>Obraz</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Codec 4CC:	</source>
- <translation type="unfinished"></translation>
+ <translation>Kod 4CC kodeka:	</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Image Size:	</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar obrazu:	</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Aspect Ratio:	</source>
- <translation type="unfinished"></translation>
+ <translation>Proporcje obrazu:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Frame Rate:	</source>
- <translation type="unfinished"></translation>
+ <translation>Liczba kl/sek.:	</translation>
 </message>
 <message>
 <location line="+2"/>
 <location line="+27"/>
 <source>Total Duration:	</source>
- <translation type="unfinished"></translation>
+ <translation>Całkowita długość:</translation>
 </message>
 <message>
 <location line="-25"/>
 <source>Extra Video Properties</source>
- <translation type="unfinished"></translation>
+ <translation>Dodatkowe właściwości wideo</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>ExtraDataSize:	</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar dodatkowych danych:</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Extra data:	</source>
- <translation type="unfinished"></translation>
+ <translation>Dodatkowe dane:	</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Audio</source>
- <translation type="unfinished"></translation>
+ <translation>Dźwięk</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Codec:		</source>
- <translation type="unfinished"></translation>
+ <translation>Kodek:		</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Channels:	</source>
- <translation type="unfinished"></translation>
+ <translation>Kanały:		</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Bitrate:	</source>
- <translation type="unfinished"></translation>
+ <translation>Przepływność:	</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Frequency:	</source>
- <translation type="unfinished"></translation>
+ <translation>Częstotliwość:	</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>No Audio</source>
- <translation type="unfinished"></translation>
+ <translation>Brak dźwięku</translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
- <translation type="unfinished"></translation>
+ <translation>%2.3f fps</translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
- <translation type="unfinished"></translation>
+ <translation>%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
- <translation type="unfinished"></translation>
+ <translation>%s (%u:%u)</translation>
 </message>
 </context>
 <context>
@@ -13261,31 +13665,31 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
 <source>Alert</source>
- <translation type="unfinished">Powiadom mnie</translation>
+ <translation>Powiadom mnie</translation>
 </message>
 <message>
 <location line="+6"/>
 <location line="+25"/>
 <location line="+25"/>
 <source>Info</source>
- <translation type="unfinished"></translation>
+ <translation>Informacja</translation>
 </message>
 <message>
 <location line="+24"/>
 <location line="+30"/>
 <source>Confirmation</source>
- <translation type="unfinished"></translation>
+ <translation>Potwierdzenie</translation>
 </message>
 <message>
 <location line="+19"/>
 <location line="+30"/>
 <source>Question</source>
- <translation type="unfinished"></translation>
+ <translation>Pytanie</translation>
 </message>
 <message>
 <location line="-7"/>
 <source>Question?</source>
- <translation type="unfinished"></translation>
+ <translation>Pytanie?</translation>
 </message>
 </context>
 <context>
@@ -13293,7 +13697,7 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
 <source>Open Avidemux</source>
- <translation type="unfinished">Otwórz Avidemux</translation>
+ <translation>Otwórz Avidemux</translation>
 </message>
 </context>
 <context>
@@ -13301,7 +13705,7 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
 <source>Select Idx File</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik IDX</translation>
 </message>
 </context>
 <context>
@@ -13321,22 +13725,22 @@
 <message>
 <location line="-106"/>
 <source>Remove Plane</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Usuń poziomy</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Usuń poziom Y, U lub V (używany głównie do debugowania innych filtrów).</translation>
 </message>
 <message>
 <location line="+105"/>
 <source>Keep Y Plane</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Zachowaj poziom Y</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Keep U Plane</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Zachowaj poziom U</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -13346,7 +13750,7 @@
 <message>
 <location line="+1"/>
 <source>Keep V Plane</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Zachowaj poziom V</translation>
 </message>
 <message>
 <location line="+0"/>
@@ -13356,83 +13760,83 @@
 <message>
 <location line="+5"/>
 <source>Remove plane</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Usuń poziomy</translation>
 </message>
 </context>
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
- <translation type="unfinished">_Tryb:</translation>
+ <translation>_Tryb:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_New frame rate:</source>
- <translation type="unfinished">_Nowa liczba klatek na sekundę:</translation>
+ <translation>_Nowa liczba klatek na sekundę:</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Resample fps</source>
- <translation type="unfinished">Zmień liczbę kl./s</translation>
+ <translation>Zmień liczbę klatek/s</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
- <translation type="unfinished">Własna</translation>
+ <translation>Własna</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>25 (PAL)</source>
- <translation type="unfinished"></translation>
+ <translation>25 (PAL)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>23.976 (Film)</source>
- <translation type="unfinished"></translation>
+ <translation>23.976 (Film)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>29.97 (NTSC)</source>
- <translation type="unfinished"></translation>
+ <translation>29.97 (NTSC)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>50 (Pal)</source>
- <translation type="unfinished"></translation>
+ <translation>50 (Pal)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>59.93 (NTSC)</source>
- <translation type="unfinished"></translation>
+ <translation>59.93 (NTSC)</translation>
 </message>
 <message>
 <location line="+35"/>
 <source>Resample FPS</source>
- <translation type="unfinished"></translation>
+ <translation>Konwertowanie FPS</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Change and enforce FPS. Keep duration and sync.</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień i wymuś FPS. Zachowaj długość i synchronizację.</translation>
 </message>
 </context>
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
- <translation type="unfinished">Szerokość i wysokość nie mogą być nieparzyste</translation>
+ <translation>Szerokość i wysokość nie mogą być nieparzyste</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
 <source>swsResize</source>
- <translation type="unfinished"></translation>
+ <translation>Zmiana rozmiaru</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>swScale Resizer.</source>
- <translation type="unfinished"></translation>
+ <translation>Zmień rozmiar filmu.</translation>
 </message>
 </context>
 <context>
@@ -13450,11 +13854,9 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+13"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+13"/>
 <source>Resize</source>
- <translation type="unfinished">Zmień rozmiar</translation>
+ <translation>Zmień rozmiar</translation>
 </message>
 <message>
- <location line="+50"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
@@ -13476,13 +13878,11 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+50"/>
 <location line="+42"/>
 <source>1:1</source>
- <translation type="unfinished">1:1</translation>
+ <translation>1:1</translation>
 </message>
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -13502,13 +13902,11 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <source>4:3</source>
- <translation type="unfinished">4:3</translation>
+ <translation>4:3</translation>
 </message>
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -13528,10 +13926,10 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <source>16:9</source>
- <translation type="unfinished">16:9</translation>
+ <translation>16:9</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
@@ -13543,7 +13941,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+172"/>
 <source>1%</source>
- <translation type="unfinished">1%</translation>
+ <translation>1%</translation>
 </message>
 <message>
 <location line="+40"/>
@@ -13558,7 +13956,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+40"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+40"/>
 <source>200%</source>
- <translation type="unfinished">200%</translation>
+ <translation>200%</translation>
 </message>
 <message>
 <location line="+116"/>
@@ -13573,7 +13971,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+116"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+116"/>
 <source>Bilinear</source>
- <translation type="unfinished">Dwuliniowy</translation>
+ <translation>Dwuliniowa (bilinear)</translation>
 </message>
 <message>
 <location line="+5"/>
@@ -13588,10 +13986,10 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
 <source>Bicubic</source>
- <translation type="unfinished">Dwusześcienna</translation>
+ <translation>Dwusześcienna (bicubic)</translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -13603,7 +14001,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-423"/>
 <source>Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Proporcje obrazu</translation>
 </message>
 <message>
 <location line="+12"/>
@@ -13618,10 +14016,9 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
 <source>Lock Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Zablokuj proporcje obrazu</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -13633,11 +14030,10 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
 <source>Source:</source>
- <translation type="unfinished"></translation>
+ <translation>Źródło:</translation>
 </message>
 <message>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+42"/>
@@ -13648,10 +14044,26 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+42"/>
 <source>Destination:</source>
+ <translation>Cel:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -13663,7 +14075,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
 <source>Resize Dimensions</source>
- <translation type="unfinished"></translation>
+ <translation>Zmiana rozmiaru</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -13678,7 +14090,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
 <source>Width:</source>
- <translation type="unfinished"></translation>
+ <translation>Szerokość:</translation>
 </message>
 <message>
 <location line="+36"/>
@@ -13693,7 +14105,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+36"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+36"/>
 <source>Height:</source>
- <translation type="unfinished"></translation>
+ <translation>Wysokość:</translation>
 </message>
 <message>
 <location line="+35"/>
@@ -13708,7 +14120,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
 <source>Round to the Nearest Multiple of 16</source>
- <translation type="unfinished"></translation>
+ <translation>Zaokrągl do najbliższej wielokrotności 16</translation>
 </message>
 <message>
 <location line="+75"/>
@@ -13723,7 +14135,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+75"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+75"/>
 <source>Percent</source>
- <translation type="unfinished"></translation>
+ <translation>Procent</translation>
 </message>
 <message>
 <location line="+70"/>
@@ -13738,7 +14150,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+70"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+70"/>
 <source>Error X / Y:</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd X / Y:</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -13753,7 +14165,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+7"/>
 <source>0.00 / 0.00</source>
- <translation type="unfinished"></translation>
+ <translation>0.00 / 0.00</translation>
 </message>
 <message>
 <location line="+51"/>
@@ -13768,7 +14180,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+51"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+51"/>
 <source>Resize Method:</source>
- <translation type="unfinished"></translation>
+ <translation>Metoda skalowania:</translation>
 </message>
 <message>
 <location line="+18"/>
@@ -13783,7 +14195,7 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
 <source>Lanzcos3</source>
- <translation type="unfinished"></translation>
+ <translation>Lanzcos3</translation>
 </message>
 </context>
 <context>
@@ -13799,52 +14211,52 @@
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
 <location line="+163"/>
 <source>Rotate</source>
- <translation type="unfinished">Obróć</translation>
+ <translation>Obrót</translation>
 </message>
 <message>
 <location line="-7"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>90 degrees</source>
- <translation type="unfinished">90 stopni</translation>
+ <translation>90 stopni</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>180 degrees</source>
- <translation type="unfinished">180 stopni</translation>
+ <translation>180 stopni</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>270 degrees</source>
- <translation type="unfinished">270 stopni</translation>
+ <translation>270 stopni</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Angle:</source>
- <translation type="unfinished">_Kąt:</translation>
+ <translation>_Kąt:</translation>
 </message>
 <message>
 <location line="-4"/>
 <source>90°</source>
- <translation type="unfinished">90°</translation>
+ <translation>90°</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>180°</source>
- <translation type="unfinished">180°</translation>
+ <translation>180°</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>270°</source>
- <translation type="unfinished">270°</translation>
+ <translation>270°</translation>
 </message>
 <message>
 <location line="-158"/>
 <source>Rotate the image by 90/180/270 degrees.</source>
- <translation type="unfinished"></translation>
+ <translation>Obróć obraz o 90/180/270 stopni.</translation>
 </message>
 </context>
 <context>
@@ -13879,7 +14291,7 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
 <source>Preview</source>
- <translation type="unfinished">Podgląd</translation>
+ <translation>Podgląd</translation>
 </message>
 <message>
 <source>00:00:00.000</source>
@@ -13888,37 +14300,37 @@
 <message>
 <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
 <source>Back one minute</source>
- <translation type="unfinished"></translation>
+ <translation>Wstecz jedna minuta</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>&lt;&lt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;&lt;</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Play</source>
- <translation type="unfinished"></translation>
+ <translation>Odtwórz</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Next image</source>
- <translation type="unfinished"></translation>
+ <translation>Następny obraz</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&gt;</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>&gt;&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&gt;&gt;</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Forward one minute</source>
- <translation type="unfinished"></translation>
+ <translation>Do przodu jedna minuta</translation>
 </message>
 </context>
 <context>
@@ -13926,12 +14338,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
 <source>Separate Fields</source>
- <translation type="unfinished"></translation>
+ <translation>Podziel obszary</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Split each image into 2 fields.</source>
- <translation type="unfinished"></translation>
+ <translation>Podziel każdy obraz na 2 obszary</translation>
 </message>
 </context>
 <context>
@@ -13939,7 +14351,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-3"/>
 <source>Reload shader</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładuj shader</translation>
 </message>
 </context>
 <context>
@@ -13947,7 +14359,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+27"/>
 <source>Sharpen convolution.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Wyostrzanie splotowe</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -13960,11 +14372,35 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
 <source>Stack Fields</source>
- <translation type="unfinished"></translation>
+ <translation>Stack Fields</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Put even lines on top, odd lines at bottom.</source>
+ <translation>Umieszczaj parzyste linie na górze, nieparzyste linie na dole.</translation>
+ </message>
+</context>
+<context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -14004,12 +14440,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
 <source>Swap UV</source>
- <translation type="unfinished"></translation>
+ <translation>Zamień UV</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Swap the U and V planes.</source>
- <translation type="unfinished"></translation>
+ <translation>Zamień obszary U i V.</translation>
 </message>
 </context>
 <context>
@@ -14017,17 +14453,17 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
 <source>Decomb telecide</source>
- <translation type="unfinished"></translation>
+ <translation>Decomb telecide</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
- <translation type="unfinished"></translation>
+ <translation>Donald Graft Telecide. Zastąp wzór IVTC progresywnymi ramkami. Wideo pozostaje przy 30 fps.</translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+186"/>
 <source>No strategy</source>
- <translation type="unfinished">Brak strategii</translation>
+ <translation>Brak strategii</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -14037,27 +14473,27 @@
 <message>
 <location line="+1"/>
 <source>PAL/SECAM</source>
- <translation type="unfinished">PAL/SECAM</translation>
+ <translation>PAL/SECAM</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>NTSC converted from PAL</source>
- <translation type="unfinished">NTSC przekonwertowane z PAL</translation>
+ <translation>NTSC przekonwertowane z PAL</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Top</source>
- <translation type="unfinished">Góra</translation>
+ <translation>Góra</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Bottom</source>
- <translation type="unfinished">Dół</translation>
+ <translation>Dół</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Never</source>
- <translation type="unfinished">Nigdy</translation>
+ <translation>Nigdy</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -14067,7 +14503,7 @@
 <message>
 <location line="+1"/>
 <source>Always</source>
- <translation type="unfinished">Zawsze</translation>
+ <translation>Zawsze</translation>
 </message>
 <message>
 <location line="+4"/>
@@ -14102,7 +14538,7 @@
 <message>
 <location line="+4"/>
 <source>_Strategy:</source>
- <translation type="unfinished">_Strategia</translation>
+ <translation>_Strategia:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -14112,12 +14548,12 @@
 <message>
 <location line="+1"/>
 <source>_Postprocessing:</source>
- <translation type="unfinished">_Przetwarzanie dodatkowe:</translation>
+ <translation>Przetwarzanie końcowe:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Try backward:</source>
- <translation type="unfinished">Spróbuj ws_tecz:</translation>
+ <translation>Spróbuj wstecz:</translation>
 </message>
 <message>
 <location line="+2"/>
@@ -14132,32 +14568,32 @@
 <message>
 <location line="+1"/>
 <source>_Noise threshold:</source>
- <translation type="unfinished">Próg _szumu:</translation>
+ <translation>Próg szumu:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Postp_rocessing threshold:</source>
- <translation type="unfinished">Próg p_rzetwarzania dodatkowego:</translation>
+ <translation>Próg p_rzetwarzania końcowego:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Use chroma to decide</source>
- <translation type="unfinished">Zdecyd_uj na podstawie chrominancji</translation>
+ <translation>Zdecyd_uj na podstawie chrominancji</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Sho_w info</source>
- <translation type="unfinished">P_okaż informacje</translation>
+ <translation>P_okaż informacje</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Debu_g</source>
- <translation type="unfinished">Śle_dź</translation>
+ <translation>Debug</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Bl_end</source>
- <translation type="unfinished">Gradi_ent</translation>
+ <translation>Blend (zlewanie)</translation>
 </message>
 <message>
 <location line="+8"/>
@@ -14166,6 +14602,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -14179,19 +14633,19 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
- <translation type="unfinished"></translation>
+ <translation>Istnieje kilka plików z sekwencyjnymi nazwami plików. Czy wszystkie powinny być załadowane?</translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
- <translation type="unfinished">Indeksowanie</translation>
+ <translation>Indeksowanie</translation>
 </message>
 </context>
 <context>
@@ -14199,50 +14653,50 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
 <source>_Bitrate:</source>
- <translation type="unfinished">_Przepływność:</translation>
+ <translation>_Przepływność:</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>TwoLame Configuration</source>
- <translation type="unfinished">Konfiguracja TwoLame</translation>
+ <translation>Konfiguracja TwoLame</translation>
 </message>
 </context>
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
- <translation type="unfinished"></translation>
+ <translation>X11</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>MS Windows GDI</source>
- <translation type="unfinished"></translation>
+ <translation>MS Windows GDI</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Mac OS X Quartz 2D</source>
- <translation type="unfinished"></translation>
+ <translation>Mac OS X Quartz 2D</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>Mac OS X QuickDraw</source>
- <translation type="unfinished"></translation>
+ <translation>Mac OS X QuickDraw</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>OpenGL</source>
- <translation type="unfinished"></translation>
+ <translation>OpenGL</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>MS Windows Direct3D</source>
- <translation type="unfinished"></translation>
+ <translation>MS Windows Direct3D</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Default Raster</source>
- <translation type="unfinished"></translation>
+ <translation>Domyślny Raster</translation>
 </message>
 </context>
 <context>
@@ -14259,6 +14713,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -14294,19 +14769,16 @@
 <context>
 <name>vaenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
 <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Przepływność (kb/s):</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Maks. przepływność (kb/s):</translation>
 </message>
 <message>
- <location line="+4"/>
 <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Koder VAAPI H264</translation>
 </message>
 </context>
 <context>
@@ -14400,12 +14872,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
 <source>Vertical Flip</source>
- <translation type="unfinished"></translation>
+ <translation>Odbicie pionowe</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Vertically flip the image.</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć obraz w pionie.</translation>
 </message>
 </context>
 <context>
@@ -14538,7 +15010,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+331"/>
 <source>VBR</source>
- <translation type="unfinished">VBR</translation>
+ <translation>VBR</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -14619,27 +15091,27 @@
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
 <source>Processing</source>
- <translation type="unfinished">Przetwarzanie</translation>
+ <translation>Przetwarzanie</translation>
 </message>
 <message>
 <location line="+112"/>
 <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
+ <translation>00:00:00</translation>
 </message>
 <message>
 <location line="-48"/>
 <source>Elapsed:</source>
- <translation type="unfinished"></translation>
+ <translation>Upłynęło:</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Time Remaining:</source>
- <translation type="unfinished"></translation>
+ <translation>Pozostały czas:</translation>
 </message>
 <message>
 <location line="+113"/>
 <source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>Anuluj</translation>
 </message>
 </context>
 <context>
@@ -14656,9 +15128,9 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
- <translation type="unfinished"></translation>
+ <translation>brak</translation>
 </message>
 <message>
 <location line="+33"/>
@@ -14674,35 +15146,35 @@
 <location line="+1"/>
 <location line="+19"/>
 <source>kbit/s</source>
- <translation type="unfinished">kbit/s</translation>
+ <translation>kbit/s</translation>
 </message>
 <message>
 <location line="-15"/>
 <source>Quantiser:</source>
- <translation type="unfinished">Kwantyzator:</translation>
+ <translation>Kwantyzator:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Quality:</source>
- <translation type="unfinished">Jakość:</translation>
+ <translation>Jakość:</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Target Video Size:</source>
- <translation type="unfinished">Rozmiar docelowego obrazu wideo:</translation>
+ <translation>Rozmiar docelowego wideo:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <translation>MB</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Average Bitrate:</source>
- <translation type="unfinished">Średnia przepływność:</translation>
+ <translation>Średnia przepływność:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -14716,67 +15188,68 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
 <location line="-83"/>
 <source>Cannot load preset</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wczytać ustawień</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>Save Profile</source>
- <translation type="unfinished"></translation>
+ <translation>Zapisz profil</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>my profile</source>
- <translation type="unfinished"></translation>
+ <translation>mój profil</translation>
 </message>
 <message>
 <location line="+34"/>
 <source>Overwrite</source>
- <translation type="unfinished"></translation>
+ <translation>Zastąp</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Replace the following preset ?:</source>
- <translation type="unfinished"></translation>
+ <translation>Zastąpić następujące ustawienie?:</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Cannot save preset</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać ustawień</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Cannot delete custom profile</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć własnego profilu</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Do you really want to delete the </source>
- <translation type="unfinished"></translation>
+ <translation>Na pewno chcesz usunąć profil &quot;</translation>
 </message>
 <message>
 <location line="+1"/>
 <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
- <translation type="unfinished"></translation>
+ <translation>&quot;?
+Jeśli jest to profil systemowy, zostanie odtworzony następnym razem.</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Delete preset</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń ustawienie</translation>
 </message>
 <message>
 <location line="+0"/>
 <source>Delete</source>
- <translation type="unfinished">Usuń</translation>
+ <translation>Usuń</translation>
 </message>
 </context>
 <context>
@@ -14792,7 +15265,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+56"/>
 <source>Save As</source>
- <translation type="unfinished">Zapisz jako</translation>
+ <translation>Zapisz jako</translation>
 </message>
 <message>
 <source>x264 Configuration File (*.xml)</source>
@@ -14809,7 +15282,7 @@
 <message>
 <location line="+2982"/>
 <source>kbit/s</source>
- <translation type="unfinished">kbit/s</translation>
+ <translation>kbit/s</translation>
 </message>
 <message>
 <source>Quantiser:</source>
@@ -14822,12 +15295,12 @@
 <message>
 <location line="-2655"/>
 <source>Target Video Size:</source>
- <translation type="unfinished">Rozmiar docelowego obrazu wideo:</translation>
+ <translation>Rozmiar docelowego wideo:</translation>
 </message>
 <message>
 <location line="+78"/>
 <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <translation>MB</translation>
 </message>
 <message>
 <source>Average Bitrate:</source>
@@ -14840,45 +15313,45 @@
 <message>
 <location line="-422"/>
 <source>Configuration:</source>
- <translation type="unfinished">Konfiguracja:</translation>
+ <translation>Konfiguracja:</translation>
 </message>
 <message>
 <location line="+24"/>
 <location line="+3152"/>
 <source>Delete</source>
- <translation type="unfinished">Usuń</translation>
+ <translation>Usuń</translation>
 </message>
 <message>
 <location line="-2840"/>
 <source>Rate Control</source>
- <translation type="unfinished">Kontrola przepływności</translation>
+ <translation>Kontrola przepływności</translation>
 </message>
 <message>
 <location line="+169"/>
 <location line="+200"/>
 <location line="+1649"/>
 <source>Quantiser</source>
- <translation type="unfinished">Kwantyzator</translation>
+ <translation>Kwantyzator</translation>
 </message>
 <message>
 <location line="+864"/>
 <source>Disable</source>
- <translation type="unfinished">Wyłącz</translation>
+ <translation>Wyłącz</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Auto-detect</source>
- <translation type="unfinished">Automatyczne wykrycie</translation>
+ <translation>Automatyczne wykrycie</translation>
 </message>
 <message>
 <location line="-2298"/>
 <source>Motion Estimation</source>
- <translation type="unfinished">Szacowanie ruchu</translation>
+ <translation>Szacowanie ruchu</translation>
 </message>
 <message>
 <location line="+41"/>
 <source>Hadamard Exhaustive Search</source>
- <translation type="unfinished">Rozszerzone wyszukiwanie metodą Hadamarda</translation>
+ <translation>Rozszerzone wyszukiwanie metodą Hadamarda</translation>
 </message>
 <message>
 <source>9 (Best)</source>
@@ -14889,196 +15362,196 @@
 <location line="+450"/>
 <location line="+36"/>
 <source>Disabled</source>
- <translation type="unfinished">Wyłączony</translation>
+ <translation>Wyłączony</translation>
 </message>
 <message>
 <location line="-433"/>
 <location line="+2596"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="-2158"/>
 <source>Fast</source>
- <translation type="unfinished">Szybki</translation>
+ <translation>Szybko</translation>
 </message>
 <message>
 <location line="+1598"/>
 <source>Output</source>
- <translation type="unfinished">Wyjscie</translation>
+ <translation>Wyjście</translation>
 </message>
 <message>
 <location line="-3165"/>
 <location line="+669"/>
 <source>1</source>
- <translation type="unfinished">1</translation>
+ <translation>1</translation>
 </message>
 <message>
 <location line="-664"/>
 <source>1.1</source>
- <translation type="unfinished">1.1</translation>
+ <translation>1.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>1.2</source>
- <translation type="unfinished">1.2</translation>
+ <translation>1.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>1.3</source>
- <translation type="unfinished">1.3</translation>
+ <translation>1.3</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2</source>
- <translation type="unfinished">2</translation>
+ <translation>2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2.1</source>
- <translation type="unfinished">2.1</translation>
+ <translation>2.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2.2</source>
- <translation type="unfinished">2.2</translation>
+ <translation>2.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <location line="+639"/>
 <source>3</source>
- <translation type="unfinished">3</translation>
+ <translation>3</translation>
 </message>
 <message>
 <location line="-634"/>
 <source>3.1</source>
- <translation type="unfinished">3.1</translation>
+ <translation>3.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>3.2</source>
- <translation type="unfinished">3.2</translation>
+ <translation>3.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>4</source>
- <translation type="unfinished">4</translation>
+ <translation>4</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>4.1</source>
- <translation type="unfinished">4.1</translation>
+ <translation>4.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>4.2</source>
- <translation type="unfinished">4.2</translation>
+ <translation>4.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>5</source>
- <translation type="unfinished">5</translation>
+ <translation>5</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>5.1</source>
- <translation type="unfinished">5.1</translation>
+ <translation>5.1</translation>
 </message>
 <message>
 <location line="+594"/>
 <source>0</source>
- <translation type="unfinished">0</translation>
+ <translation>0</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>7</source>
- <translation type="unfinished">7</translation>
+ <translation>7</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>15</source>
- <translation type="unfinished">15</translation>
+ <translation>15</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>31</source>
- <translation type="unfinished">31</translation>
+ <translation>31</translation>
 </message>
 <message>
 <location line="+2738"/>
 <source>Crop</source>
- <translation type="unfinished">Kadrowanie</translation>
+ <translation>Kadruj</translation>
 </message>
 <message>
 <location line="-2567"/>
- <source>10 (Best)</source>
- <translation type="unfinished">9 (Najlepszy) {10 ?}</translation>
+ <source>11 (Best)</source>
+ <translation>11 (Najlepiej)</translation>
 </message>
 <message>
 <location line="+1745"/>
 <source>Normal</source>
- <translation type="unfinished">Zwykły</translation>
+ <translation>Zwykły</translation>
 </message>
 <message>
 <location line="+1125"/>
 <source>VBR</source>
- <translation type="unfinished">VBR</translation>
+ <translation>VBR</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>CBR</source>
- <translation type="unfinished">CBR</translation>
+ <translation>CBR</translation>
 </message>
 <message>
 <location line="-3949"/>
 <source>x264 Configuraton</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja x264</translation>
 </message>
 <message>
 <location line="+90"/>
 <source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Basic</source>
- <translation type="unfinished"></translation>
+ <translation>Podstawowe</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Use advanced configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj zaawansowanej konfiguracji</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Profile:</source>
- <translation type="unfinished"></translation>
+ <translation>Profil:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Preset:</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienie:</translation>
 </message>
 <message>
 <location line="+51"/>
 <source>Tuning:</source>
- <translation type="unfinished"></translation>
+ <translation>Strojenie:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>IDC Level:</source>
- <translation type="unfinished"></translation>
+ <translation>Poziom IDC:</translation>
 </message>
 <message>
 <location line="+33"/>
 <location line="+1149"/>
 <source>Auto</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie</translation>
 </message>
 <message>
 <location line="-1049"/>
 <source>Fast Decode</source>
- <translation type="unfinished"></translation>
+ <translation>Szybkie dekodowanie</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -15088,69 +15561,69 @@
 <message>
 <location line="+7"/>
 <source>Fast First Pass</source>
- <translation type="unfinished"></translation>
+ <translation>Szybki pierwszy przebieg</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Threads </source>
- <translation type="unfinished"></translation>
+ <translation>Wątki </translation>
 </message>
 <message>
 <location line="+49"/>
 <source>Constant Bitrate (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Stała przepływność (jeden przebieg)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Constant Quantiser (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Stała kwantyzacja (jeden przebieg)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Constant Rate Factor (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Stały współczynnik szybkości CRF (jeden przebieg)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Video Size (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar wideo (dwa przebiegi)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Average Bitrate (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Średnia przepływność (dwa przebiegi)</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Encoding Mode:</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb kodowania:</translation>
 </message>
 <message>
 <location line="+82"/>
 <location line="+200"/>
 <source>0 (High Quality)</source>
- <translation type="unfinished"></translation>
+ <translation>0 (Wysoka jakość)</translation>
 </message>
 <message>
 <location line="-154"/>
 <location line="+200"/>
 <source>51 (Low Quality)</source>
- <translation type="unfinished"></translation>
+ <translation>51 (Niska jakość)</translation>
 </message>
 <message>
 <location line="-101"/>
 <source>Advanced RC</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowany RC</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Advanced Rate Control</source>
- <translation type="unfinished"></translation>
+ <translation>Advanced Rate Control</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Maximum Constant Rate Factor</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Maksymalny stały współczynnik szybkości (CRF)</translation>
 </message>
 <message>
 <location line="+158"/>
@@ -15176,12 +15649,12 @@
 <message>
 <location line="+77"/>
 <source>Motion</source>
- <translation type="unfinished"></translation>
+ <translation>Ruch</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Motion Estimation Method:</source>
- <translation type="unfinished"></translation>
+ <translation>Metoda szacowania ruchu:</translation>
 </message>
 <message>
 <location line="+13"/>
@@ -15206,7 +15679,7 @@
 <message>
 <location line="+47"/>
 <source>1 (Fast)</source>
- <translation type="unfinished"></translation>
+ <translation>1 (Szybko)</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -15216,7 +15689,7 @@
 <message>
 <location line="+98"/>
 <source>Motion Vector</source>
- <translation type="unfinished"></translation>
+ <translation>Wektory ruchu</translation>
 </message>
 <message>
 <location line="+38"/>
@@ -15236,7 +15709,7 @@
 <message>
 <location line="+12"/>
 <source>Prediction</source>
- <translation type="unfinished"></translation>
+ <translation>Przewidywanie</translation>
 </message>
 <message>
 <location line="+16"/>
@@ -15251,27 +15724,27 @@
 <message>
 <location line="+23"/>
 <source>Direct Prediction Mode:</source>
- <translation type="unfinished"></translation>
+ <translation>Bezpośredni tryb przewidywania:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Weighted Prediction for P-frames:</source>
- <translation type="unfinished"></translation>
+ <translation>Ważone przewidywanie dla klatek P:</translation>
 </message>
 <message>
 <location line="+18"/>
 <source>Spatial</source>
- <translation type="unfinished"></translation>
+ <translation>Przestrzenny</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Temporal</source>
- <translation type="unfinished"></translation>
+ <translation>Czasowy</translation>
 </message>
 <message>
 <location line="+30"/>
 <source>Weighted Prediction for B-frames</source>
- <translation type="unfinished"></translation>
+ <translation>Ważone przewidywanie dla klatek B</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -15281,7 +15754,7 @@
 <message>
 <location line="+24"/>
 <source>Partition</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Partycje</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -15291,7 +15764,7 @@
 <message>
 <location line="+8"/>
 <source>8x8 DCT Spatial Transform</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">8x8 DCT transformacja przestrzenna</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -15321,33 +15794,33 @@
 <message>
 <location line="+26"/>
 <source>Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Klatka</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Frame Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Kodowanie klatek</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>CABAC</source>
- <translation type="unfinished"></translation>
+ <translation>CABAC</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Loop Filter:</source>
- <translation type="unfinished"></translation>
+ <translation>Loop Filter (de-blocking):</translation>
 </message>
 <message>
 <location line="+12"/>
 <location line="+1328"/>
 <source>Strength:</source>
- <translation type="unfinished"></translation>
+ <translation>Natężenie:</translation>
 </message>
 <message>
 <location line="-1289"/>
 <source>Threshold:</source>
- <translation type="unfinished"></translation>
+ <translation>Próg:</translation>
 </message>
 <message>
 <location line="+35"/>
@@ -15357,92 +15830,92 @@
 <message>
 <location line="+13"/>
 <source>Normal Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb normalny</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Blu-ray Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb Blu-ray</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Interlaced:</source>
- <translation type="unfinished"></translation>
+ <translation>Z przeplotem:</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>Bottom Field First</source>
- <translation type="unfinished"></translation>
+ <translation>Najpierw półobraz dolny</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Top Field First</source>
- <translation type="unfinished"></translation>
+ <translation>Najpierw półobraz górny</translation>
 </message>
 <message>
 <location line="+30"/>
 <source>Maximum Reference Frames:</source>
- <translation type="unfinished"></translation>
+ <translation>Maksymalna liczba klatek odniesienia:</translation>
 </message>
 <message>
 <location line="+39"/>
 <source>B-frames</source>
- <translation type="unfinished"></translation>
+ <translation>Kodowanie dwukierunkowe (B-frames)</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>B-frames as References:</source>
- <translation type="unfinished"></translation>
+ <translation>Klatki B jako referencje:</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>Strictly Hierarchical Pyramid</source>
- <translation type="unfinished"></translation>
+ <translation>Ograniczone (Strictly Hierarchical Pyramid)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Non-strict (Not Blu-ray Compatible)</source>
- <translation type="unfinished"></translation>
+ <translation>Bez ograniczeń (Nie kompatybilne z Blu-ray)</translation>
 </message>
 <message>
 <location line="+36"/>
 <source>Optimal</source>
- <translation type="unfinished"></translation>
+ <translation>Optymalnie</translation>
 </message>
 <message>
 <location line="+74"/>
 <source>B-frame Bias:</source>
- <translation type="unfinished"></translation>
+ <translation>Wpływ klatek B:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Maximum Consecutive B-frames:</source>
- <translation type="unfinished"></translation>
+ <translation>Maksymalna liczba kolejnych klatek B:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Adaptive B-frame Decision:</source>
- <translation type="unfinished"></translation>
+ <translation>Adaptacyjny wybór klatek B:</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>I-frames</source>
- <translation type="unfinished"></translation>
+ <translation>Kodowanie wewnątrzobrazowe (I-frames)</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>GOP Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar GOP:</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Minimum:</source>
- <translation type="unfinished"></translation>
+ <translation>Minimalny:</translation>
 </message>
 <message>
 <location line="+33"/>
 <source>Maximum:</source>
- <translation type="unfinished"></translation>
+ <translation>Maksymalny:</translation>
 </message>
 <message>
 <location line="+32"/>
@@ -15458,7 +15931,7 @@
 <location line="+24"/>
 <location line="+6"/>
 <source>Analysis</source>
- <translation type="unfinished"></translation>
+ <translation>Analiza</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -15473,22 +15946,22 @@
 <message>
 <location line="+9"/>
 <source>Trellis Quantization:</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja Trellis:</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>Final Macroblock Only</source>
- <translation type="unfinished"></translation>
+ <translation>Tylko ostatni makroblok</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Always On</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze włączona</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Fast Skip Detection on P-frames</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Szybkie pomijanie detekcji na klatkach P</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -15508,7 +15981,7 @@
 <message>
 <location line="+37"/>
 <source>Noise Reduction:</source>
- <translation type="unfinished"></translation>
+ <translation>Redukcja szumów:</translation>
 </message>
 <message>
 <location line="+36"/>
@@ -15528,7 +16001,7 @@
 <message>
 <location line="+66"/>
 <source>Quantisation Matrix</source>
- <translation type="unfinished"></translation>
+ <translation>Matryca kwantyzacji</translation>
 </message>
 <message>
 <location line="+8"/>
@@ -15538,28 +16011,28 @@
 <message>
 <location line="+10"/>
 <source>JVT Matrix</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Matryca JVT</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Custom Matrix</source>
- <translation type="unfinished"></translation>
+ <translation>Własna matryca</translation>
 </message>
 <message>
 <location line="+10"/>
 <location line="+856"/>
 <source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Edycja</translation>
 </message>
 <message>
 <location line="-809"/>
 <source>Quantiser Control</source>
- <translation type="unfinished"></translation>
+ <translation>Kontrola kwantyzera</translation>
 </message>
 <message>
 <location line="+35"/>
 <source>Maximum Quantiser:</source>
- <translation type="unfinished"></translation>
+ <translation>Maksymalny kwantyzer:</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -15571,12 +16044,12 @@
 <location line="+179"/>
 <location line="+302"/>
 <source>%</source>
- <translation type="unfinished"></translation>
+ <translation>%</translation>
 </message>
 <message>
 <location line="-459"/>
 <source>Maximum Quantiser Step:</source>
- <translation type="unfinished"></translation>
+ <translation>Maksymalny krok kwantyzera:</translation>
 </message>
 <message>
 <location line="+34"/>
@@ -15596,7 +16069,7 @@
 <message>
 <location line="+34"/>
 <source>Minimum Quantiser:</source>
- <translation type="unfinished"></translation>
+ <translation>Minimalny kwantyzer:</translation>
 </message>
 <message>
 <location line="+48"/>
@@ -15621,7 +16094,7 @@
 <message>
 <location line="+12"/>
 <source>Adaptive Quantisation</source>
- <translation type="unfinished"></translation>
+ <translation>Adaptacyjna kwantyzacja (AQ)</translation>
 </message>
 <message>
 <location line="+8"/>
@@ -15636,17 +16109,17 @@
 <message>
 <location line="+91"/>
 <source>Advanced 1</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane 1</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>Video Buffer Verifier</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Video Buffer Verifier</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Maximum VBV Bitrate:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Maksymalny bitrate VBV:</translation>
 </message>
 <message>
 <location line="+7"/>
@@ -15656,12 +16129,12 @@
 <message>
 <location line="+16"/>
 <source>kbit</source>
- <translation type="unfinished"></translation>
+ <translation>kbit</translation>
 </message>
 <message>
 <location line="+87"/>
 <source>VBV Buffer Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar bufora VBV:</translation>
 </message>
 <message>
 <location line="+12"/>
@@ -15696,23 +16169,23 @@
 <message>
 <location line="+20"/>
 <source>Add</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj</translation>
 </message>
 <message>
 <location line="+42"/>
 <source>Advanced 2</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane 2</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Multithreading</source>
- <translation type="unfinished"></translation>
+ <translation>Wielowątkowość</translation>
 </message>
 <message>
 <location line="+27"/>
 <source>Custom:</source>
 <comment>multithreading</comment>
- <translation type="unfinished"></translation>
+ <translation>Własna:</translation>
 </message>
 <message>
 <location line="+37"/>
@@ -15732,7 +16205,7 @@
 <message>
 <location line="+59"/>
 <source>Output 1</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjście 1</translation>
 </message>
 <message>
 <location line="+12"/>
@@ -15742,73 +16215,73 @@
 <message>
 <location line="+7"/>
 <source>BluRay compatibility</source>
- <translation type="unfinished"></translation>
+ <translation>Kompatybilność z BluRay</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Generate fake interlaced</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Generuj fałszywy przeplot</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>Pixel Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Współczynik proporcji pikseli</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Custom:</source>
 <comment>PAR</comment>
- <translation type="unfinished"></translation>
+ <translation>Własny:</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>As Input</source>
- <translation type="unfinished"></translation>
+ <translation>Jak wejście</translation>
 </message>
 <message>
 <location line="+49"/>
 <source>:</source>
- <translation type="unfinished"></translation>
+ <translation>:</translation>
 </message>
 <message>
 <location line="+35"/>
 <source>Predefined Aspect Ratio:</source>
- <translation type="unfinished"></translation>
+ <translation>Zdefiniowany współczynnik proporcji:</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>16:15 (PAL 4:3)</source>
- <translation type="unfinished"></translation>
+ <translation>16:15 (PAL 4:3)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>64:45 (PAL 16:9)</source>
- <translation type="unfinished"></translation>
+ <translation>64:45 (PAL 16:9)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>8:9 (NTSC 4:3)</source>
- <translation type="unfinished"></translation>
+ <translation>8:9 (NTSC 4:3)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>32:27 (NTSC 16:9)</source>
- <translation type="unfinished"></translation>
+ <translation>32:27 (NTSC 16:9)</translation>
 </message>
 <message>
 <location line="+42"/>
 <source>Output 2</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjście 2</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Video Usability Information</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Informacje o użyteczności wideo</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
- <translation type="unfinished"></translation>
+ <translation>Te ustawienia stanowią jedynie sugestie dla sprzętu odtwarzającego. Używaj na własne ryzyko.</translation>
 </message>
 <message>
 <location line="+28"/>
@@ -15832,32 +16305,32 @@
 <message>
 <location line="+28"/>
 <source>Video Format:</source>
- <translation type="unfinished"></translation>
+ <translation>Format wideo:</translation>
 </message>
 <message>
 <location line="+18"/>
 <source>Component</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Component</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>PAL</source>
- <translation type="unfinished"></translation>
+ <translation>PAL</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>NTSC</source>
- <translation type="unfinished"></translation>
+ <translation>NTSC</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>SECAM</source>
- <translation type="unfinished"></translation>
+ <translation>SECAM</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>MAC</source>
- <translation type="unfinished"></translation>
+ <translation>MAC</translation>
 </message>
 <message>
 <location line="+23"/>
@@ -15930,27 +16403,27 @@
 <message>
 <location line="+28"/>
 <source>Colour Matrix:</source>
- <translation type="unfinished"></translation>
+ <translation>Matryca kolorów:</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>FCC</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">FCC</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>GBR</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">GBR</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>YCgCo</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">YCgCo</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>HRD Parameters:</source>
- <translation type="unfinished"></translation>
+ <translation>Parametry HDR:</translation>
 </message>
 <message>
 <location line="+43"/>
@@ -15980,7 +16453,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+16"/>
 <source>x264 Custom Matrix</source>
- <translation type="unfinished"></translation>
+ <translation>Własna matryca x265</translation>
 </message>
 <message>
 <location line="+16"/>
@@ -16125,7 +16598,7 @@
 <translation type="unfinished">Własna</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Przepływność docelowa:</translation>
 </message>
@@ -16133,32 +16606,32 @@
 <location line="+1"/>
 <location line="+20"/>
 <source>kbit/s</source>
- <translation type="unfinished">kbit/s</translation>
+ <translation>kbit/s</translation>
 </message>
 <message>
 <location line="-15"/>
 <source>Quantiser:</source>
- <translation type="unfinished">Kwantyzator:</translation>
+ <translation>Kwantyzator:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Quality:</source>
- <translation type="unfinished">Jakość:</translation>
+ <translation>Jakość:</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Target Video Size:</source>
- <translation type="unfinished">Rozmiar docelowego obrazu wideo:</translation>
+ <translation>Rozmiar docelowego wideo:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <translation>MB</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Average Bitrate:</source>
- <translation type="unfinished">Średnia przepływność:</translation>
+ <translation>Średnia przepływność:</translation>
 </message>
 <message>
 <location line="+101"/>
@@ -16179,7 +16652,7 @@
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
- <translation type="unfinished">Błąd</translation>
+ <translation>Błąd</translation>
 </message>
 <message>
 <location line="-83"/>
@@ -16238,140 +16711,140 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
 <source>x265 Configuraton</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja x265</translation>
 </message>
 <message>
 <location line="+24"/>
 <source>Configuration:</source>
- <translation type="unfinished">Konfiguracja:</translation>
+ <translation>Konfiguracja:</translation>
 </message>
 <message>
 <location line="+17"/>
 <source>Save As</source>
- <translation type="unfinished">Zapisz jako</translation>
+ <translation>Zapisz jako</translation>
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
- <translation type="unfinished">Usuń</translation>
+ <translation>Usuń</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Ogólne</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Basic</source>
- <translation type="unfinished"></translation>
+ <translation>Podstawowe</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Use advanced configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj zaawansowanej konfiguracji</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Profile:</source>
- <translation type="unfinished"></translation>
+ <translation>Profil:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Preset:</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienie:</translation>
 </message>
 <message>
 <location line="+51"/>
 <source>Tuning:</source>
- <translation type="unfinished"></translation>
+ <translation>Strojenie:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>IDC Level:</source>
- <translation type="unfinished"></translation>
+ <translation>Poziom IDC:</translation>
 </message>
 <message>
 <location line="+33"/>
 <source>Auto</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie</translation>
 </message>
 <message>
 <location line="+5"/>
 <location line="+668"/>
 <source>1</source>
- <translation type="unfinished">1</translation>
+ <translation>1</translation>
 </message>
 <message>
 <location line="-663"/>
 <source>1.1</source>
- <translation type="unfinished">1.1</translation>
+ <translation>1.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>1.2</source>
- <translation type="unfinished">1.2</translation>
+ <translation>1.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>1.3</source>
- <translation type="unfinished">1.3</translation>
+ <translation>1.3</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2</source>
- <translation type="unfinished">2</translation>
+ <translation>2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2.1</source>
- <translation type="unfinished">2.1</translation>
+ <translation>2.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2.2</source>
- <translation type="unfinished">2.2</translation>
+ <translation>2.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <location line="+638"/>
 <source>3</source>
- <translation type="unfinished">3</translation>
+ <translation>3</translation>
 </message>
 <message>
 <location line="-633"/>
 <source>3.1</source>
- <translation type="unfinished">3.1</translation>
+ <translation>3.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>3.2</source>
- <translation type="unfinished">3.2</translation>
+ <translation>3.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>4</source>
- <translation type="unfinished">4</translation>
+ <translation>4</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>4.1</source>
- <translation type="unfinished">4.1</translation>
+ <translation>4.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>4.2</source>
- <translation type="unfinished">4.2</translation>
+ <translation>4.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>5</source>
- <translation type="unfinished">5</translation>
+ <translation>5</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>5.1</source>
- <translation type="unfinished">5.1</translation>
+ <translation>5.1</translation>
 </message>
 <message>
 <location line="+27"/>
@@ -16391,61 +16864,61 @@
 <message>
 <location line="+21"/>
 <source>Target Video Size:</source>
- <translation type="unfinished">Rozmiar docelowego obrazu wideo:</translation>
+ <translation>Rozmiar docelowego wideo:</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>Constant Bitrate (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Stała przepływność (jeden przebieg)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Constant Quantiser (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Stała kwantyzacja (jeden przebieg)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Constant Rate Factor (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Stały współczynnik jakości (jeden przebieg)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Video Size (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar wideo (dwa przebiegi)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Average Bitrate (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <translation>Średnia przepływność (dwa przebiegi)</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Encoding Mode:</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb kodowania:</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <translation>MB</translation>
 </message>
 <message>
 <location line="+44"/>
 <location line="+213"/>
 <source>0 (High Quality)</source>
- <translation type="unfinished"></translation>
+ <translation>0 (Wysoka jakość)</translation>
 </message>
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
- <translation type="unfinished">Kwantyzator</translation>
+ <translation>Kwantyzacja</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
- <translation type="unfinished"></translation>
+ <translation>51 (Niska jakość)</translation>
 </message>
 <message>
 <location line="-143"/>
@@ -16455,7 +16928,7 @@
 <message>
 <location line="+42"/>
 <source>Advanced RC</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowany RC</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -16479,49 +16952,49 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+10"/>
 <source>0</source>
- <translation type="unfinished">0</translation>
+ <translation>0</translation>
 </message>
 <message>
 <location line="+15"/>
 <source>7</source>
- <translation type="unfinished">7</translation>
+ <translation>7</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>15</source>
- <translation type="unfinished">15</translation>
+ <translation>15</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>31</source>
- <translation type="unfinished">31</translation>
+ <translation>31</translation>
 </message>
 <message>
 <location line="+42"/>
 <source>Motion</source>
- <translation type="unfinished"></translation>
+ <translation>Ruch</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Motion Estimation</source>
- <translation type="unfinished">Szacowanie ruchu</translation>
+ <translation>Szacowanie ruchu</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Motion Estimation Method:</source>
- <translation type="unfinished"></translation>
+ <translation>Metoda szacowania ruchu:</translation>
 </message>
 <message>
 <location line="+13"/>
@@ -16551,7 +17024,7 @@
 <message>
 <location line="+42"/>
 <source>1 (Fast)</source>
- <translation type="unfinished"></translation>
+ <translation>1 (Szybkie)</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -16561,12 +17034,12 @@
 <message>
 <location line="+20"/>
 <source>7 (Best)</source>
- <translation type="unfinished">9 (Najlepszy) {7 ?}</translation>
+ <translation>7 (Najlepsze)</translation>
 </message>
 <message>
 <location line="+78"/>
 <source>Motion Vector</source>
- <translation type="unfinished"></translation>
+ <translation>Wektor ruchu</translation>
 </message>
 <message>
 <location line="+35"/>
@@ -16576,7 +17049,7 @@
 <message>
 <location line="+12"/>
 <source>Prediction</source>
- <translation type="unfinished"></translation>
+ <translation>Przewidywanie</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -16613,12 +17086,12 @@
 <message>
 <location line="+42"/>
 <source>Frame</source>
- <translation type="unfinished"></translation>
+ <translation>Klatka</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Frame Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Kodowanie ramki</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -16633,27 +17106,28 @@
 <message>
 <location line="+13"/>
 <source>Normal Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb normalny</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Blu-ray Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb Blu-ray</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Interlaced:</source>
- <translation type="unfinished"></translation>
+ <translation>Z przeplotem:</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>Top Field First</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>http://www.videoaudio.pl/art-54_czym-jest-przeplot.htm</translatorcomment>
+ <translation>Najpierw półobraz górny</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Bottom Field First</source>
- <translation type="unfinished"></translation>
+ <translation>Najpierw półobraz dolny</translation>
 </message>
 <message>
 <location line="+30"/>
@@ -16734,22 +17208,22 @@
 <location line="+53"/>
 <location line="+6"/>
 <source>Analysis</source>
- <translation type="unfinished"></translation>
+ <translation>Analiza</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Trellis Quantization:</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja Trellis:</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>Final Macroblock Only</source>
- <translation type="unfinished"></translation>
+ <translation>Tylko ostatni makroblok</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Always On</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze włączona</translation>
 </message>
 <message>
 <location line="+23"/>
@@ -16782,35 +17256,40 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
- <source>Quantisation Matrix</source>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+10"/>
+ <source>Quantisation Matrix</source>
+ <translation>Matryca kwantyzacji</translation>
+ </message>
+ <message>
 <location line="+8"/>
 <source>Flat Matrix</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Płaska matryca</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>JVT Matrix</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Matryca JVT</translation>
 </message>
 <message>
 <location line="+9"/>
 <source>Custom Matrix</source>
- <translation type="unfinished"></translation>
+ <translation>Własna matryca</translation>
 </message>
 <message>
 <location line="+10"/>
 <location line="+818"/>
 <source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Edytuj</translation>
 </message>
 <message>
 <location line="-771"/>
 <source>Quantiser Control</source>
- <translation type="unfinished"></translation>
+ <translation>Kontrola kwantyzacji</translation>
 </message>
 <message>
 <location line="+8"/>
@@ -16827,7 +17306,8 @@
 <location line="+168"/>
 <location line="+302"/>
 <source>%</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>%</translatorcomment>
+ <translation></translation>
 </message>
 <message>
 <location line="-448"/>
@@ -16837,12 +17317,12 @@
 <message>
 <location line="+19"/>
 <source>Cb</source>
- <translation type="unfinished"></translation>
+ <translation>Cb</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Cr</source>
- <translation type="unfinished"></translation>
+ <translation>Cr</translation>
 </message>
 <message>
 <location line="+22"/>
@@ -16877,7 +17357,7 @@
 <message>
 <location line="+12"/>
 <source>Adaptive Quantisation</source>
- <translation type="unfinished"></translation>
+ <translation>Adaptacyjna Kwantyzacja</translation>
 </message>
 <message>
 <location line="+8"/>
@@ -16887,7 +17367,7 @@
 <message>
 <location line="+13"/>
 <source>Normal</source>
- <translation type="unfinished">Zwykły</translation>
+ <translation>Zwykły</translation>
 </message>
 <message>
 <location line="+5"/>
@@ -16897,12 +17377,12 @@
 <message>
 <location line="+26"/>
 <source>Strength:</source>
- <translation type="unfinished"></translation>
+ <translation>Natężenie:</translation>
 </message>
 <message>
 <location line="+65"/>
 <source>Advanced 1</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane 1</translation>
 </message>
 <message>
 <location line="+12"/>
@@ -16922,12 +17402,12 @@
 <message>
 <location line="+16"/>
 <source>kbit</source>
- <translation type="unfinished"></translation>
+ <translation>kbit</translation>
 </message>
 <message>
 <location line="+65"/>
 <source>kbit/s</source>
- <translation type="unfinished">kbit/s</translation>
+ <translation>kbit/s</translation>
 </message>
 <message>
 <location line="+22"/>
@@ -16937,22 +17417,22 @@
 <message>
 <location line="+12"/>
 <source>Slicing</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fragmentacja</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Slices per Frame:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Fragmentów na klatkę:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Maximum Size per Slice:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Maksymalny rozmiar fragmentu:</translation>
 </message>
 <message>
 <location line="+16"/>
 <source>bytes</source>
- <translation type="unfinished"></translation>
+ <translation>bajtów</translation>
 </message>
 <message>
 <location line="+22"/>
@@ -16962,38 +17442,38 @@
 <message>
 <location line="+58"/>
 <source>Zones</source>
- <translation type="unfinished"></translation>
+ <translation>Strefy</translation>
 </message>
 <message>
 <location line="+20"/>
 <source>Add</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj</translation>
 </message>
 <message>
 <location line="+42"/>
 <source>Advanced 2</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane 2</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Multithreading</source>
- <translation type="unfinished"></translation>
+ <translation>Wielowątkowość</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Disable</source>
- <translation type="unfinished">Wyłącz</translation>
+ <translation>Wyłącz</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Auto-detect</source>
- <translation type="unfinished">Automatyczne wykrycie</translation>
+ <translation>Wykryj automatycznie</translation>
 </message>
 <message>
 <location line="+12"/>
 <source>Custom:</source>
 <comment>multithreading</comment>
- <translation type="unfinished"></translation>
+ <translation>Własne:</translation>
 </message>
 <message>
 <location line="+37"/>
@@ -17013,12 +17493,12 @@
 <message>
 <location line="+59"/>
 <source>Output 1</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjście 1</translation>
 </message>
 <message>
 <location line="+6"/>
 <source>Output</source>
- <translation type="unfinished">Wyjscie</translation>
+ <translation>Wyjście</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -17028,53 +17508,53 @@
 <message>
 <location line="+10"/>
 <source>Pixel Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Współczynik proporcji pikseli</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Custom:</source>
 <comment>PAR</comment>
- <translation type="unfinished"></translation>
+ <translation>Własny:</translation>
 </message>
 <message>
 <location line="+10"/>
 <source>As Input</source>
- <translation type="unfinished"></translation>
+ <translation>Jak wejście</translation>
 </message>
 <message>
 <location line="+49"/>
 <source>:</source>
- <translation type="unfinished"></translation>
+ <translation>:</translation>
 </message>
 <message>
 <location line="+35"/>
 <source>Predefined Aspect Ratio:</source>
- <translation type="unfinished"></translation>
+ <translation>Zdefiniowany współczynnik proporcji:</translation>
 </message>
 <message>
 <location line="+13"/>
 <source>16:15 (PAL 4:3)</source>
- <translation type="unfinished"></translation>
+ <translation>16:15 (PAL 4:3)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>64:45 (PAL 16:9)</source>
- <translation type="unfinished"></translation>
+ <translation>64:45 (PAL 16:9)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>8:9 (NTSC 4:3)</source>
- <translation type="unfinished"></translation>
+ <translation>8:9 (NTSC 4:3)</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>32:27 (NTSC 16:9)</source>
- <translation type="unfinished"></translation>
+ <translation>32:27 (NTSC 16:9)</translation>
 </message>
 <message>
 <location line="+42"/>
 <source>Output 2</source>
- <translation type="unfinished"></translation>
+ <translation>Wyjście 2</translation>
 </message>
 <message>
 <location line="+6"/>
@@ -17084,7 +17564,7 @@
 <message>
 <location line="+6"/>
 <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
- <translation type="unfinished"></translation>
+ <translation>Te ustawienia stanowią jedynie sugestie dotyczące sprzętu odtwarzającego. Używaj na własne ryzyko.</translation>
 </message>
 <message>
 <location line="+28"/>
@@ -17108,12 +17588,12 @@
 <message>
 <location line="+5"/>
 <source>Crop</source>
- <translation type="unfinished">Kadrowanie</translation>
+ <translation>Kadrowanie</translation>
 </message>
 <message>
 <location line="+23"/>
 <source>Video Format:</source>
- <translation type="unfinished"></translation>
+ <translation>Format wideo:</translation>
 </message>
 <message>
 <location line="+18"/>
@@ -17123,22 +17603,22 @@
 <message>
 <location line="+5"/>
 <source>PAL</source>
- <translation type="unfinished"></translation>
+ <translation>PAL</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>NTSC</source>
- <translation type="unfinished"></translation>
+ <translation>NTSC</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>SECAM</source>
- <translation type="unfinished"></translation>
+ <translation>SECAM</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>MAC</source>
- <translation type="unfinished"></translation>
+ <translation>MAC</translation>
 </message>
 <message>
 <location line="+23"/>
@@ -17264,7 +17744,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+14"/>
 <source>x265 Custom Matrix</source>
- <translation type="unfinished"></translation>
+ <translation>Własna matryca x265</translation>
 </message>
 <message>
 <location line="+16"/>
@@ -17353,32 +17833,32 @@
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
 <location line="+24"/>
 <source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
 </message>
 <message>
 <location line="-23"/>
 <source>Low</source>
- <translation type="unfinished">Niski</translation>
+ <translation type="unfinished">Niskie</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Medium</source>
- <translation type="unfinished">Średni</translation>
+ <translation type="unfinished">Średnie</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Full</source>
- <translation type="unfinished">Pełny</translation>
+ <translation type="unfinished">Pełne</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>H.263</source>
- <translation type="unfinished">H.263</translation>
+ <translation>H.263</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
+ <translation>MPEG</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -17408,37 +17888,37 @@
 <message>
 <location line="+9"/>
 <source>Threading</source>
- <translation type="unfinished">Wątkowanie</translation>
+ <translation>Wątkowanie</translation>
 </message>
 <message>
 <location line="+40"/>
 <source>Motion Estimation</source>
- <translation type="unfinished">Szacowanie ruchu</translation>
+ <translation>Szacowanie ruchu:</translation>
 </message>
 <message>
 <location line="+21"/>
 <source>Rate Control</source>
- <translation type="unfinished">Kontrola przepływności</translation>
+ <translation>Kontrola przepływności</translation>
 </message>
 <message>
 <location line="-45"/>
 <source>Aspect Ratio:</source>
- <translation type="unfinished">Proporcje obrazu:</translation>
+ <translation>Proporcje obrazu:</translation>
 </message>
 <message>
 <location line="-43"/>
 <source>DCT</source>
- <translation type="unfinished"></translation>
+ <translation>DCT</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Qpel16</source>
- <translation type="unfinished"></translation>
+ <translation>Qpel16</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Qpel8</source>
- <translation type="unfinished"></translation>
+ <translation>Qpel8</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -17448,57 +17928,57 @@
 <message>
 <location line="+4"/>
 <source>One thread</source>
- <translation type="unfinished"></translation>
+ <translation>Jeden wątek</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Two threads)</source>
- <translation type="unfinished"></translation>
+ <translation>Dwa wątki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Three threads</source>
- <translation type="unfinished"></translation>
+ <translation>Trzy wątki</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Auto (#cpu)</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie (#cpu)</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>1:1 (PC)</source>
- <translation type="unfinished"></translation>
+ <translation>1:1 (PC)</translation>
 </message>
 <message>
 <location line="+11"/>
 <source>MotionEstimation</source>
- <translation type="unfinished"></translation>
+ <translation>Szacowanie ruchu</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
+ <translation>Min. kwantyzer:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
+ <translation>Maks. kwantyzer:</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja Trellis</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Number of B frames:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Ilość klatek typu B:</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Quantization type:</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Typ kwantyzacji:</translation>
 </message>
 <message>
 <location line="+2"/>
@@ -17508,7 +17988,7 @@
 <message>
 <location line="+2"/>
 <source>Profile:</source>
- <translation type="unfinished"></translation>
+ <translation>Profil:</translation>
 </message>
 <message>
 <location line="+10"/>
@@ -17518,32 +17998,32 @@
 <message>
 <location line="+3"/>
 <source>Use XVID fcc (else DIVX)</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj XVID fcc (przeciwnie DIVX)</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Advanced Simple Profile</source>
- <translation type="unfinished"></translation>
+ <translation>Advanced Simple Profile</translation>
 </message>
 <message>
 <location line="+14"/>
 <source>Quantization</source>
- <translation type="unfinished"></translation>
+ <translation>Kwantyzacja</translation>
 </message>
 <message>
 <location line="+4"/>
 <source>Threads</source>
- <translation type="unfinished"></translation>
+ <translation>Wątki</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Proporcje obrazu</translation>
 </message>
 <message>
 <location line="+8"/>
 <source>Xvid4 MPEG-4 ASP configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja Xvid4 MPEG-4 ASP</translation>
 </message>
 </context>
 <context>
@@ -17551,12 +18031,12 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
 <source>Yadif</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Yadif</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Yadif, port of avisynth version (c) Fizick.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Yadif, przeniesione z wersji avisynth (c) Fizick.</translation>
 </message>
 <message>
 <location line="+53"/>
@@ -17581,17 +18061,17 @@
 <message>
 <location line="+3"/>
 <source>Bottom field first</source>
- <translation type="unfinished">Najpierw obszar dolny</translation>
+ <translation>Najpierw półobraz dolny</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Top field first</source>
- <translation type="unfinished">Najpierw obszar górny</translation>
+ <translation>Najpierw półobraz górny</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>_Mode:</source>
- <translation type="unfinished">_Tryb:</translation>
+ <translation>_Tryb:</translation>
 </message>
 <message>
 <location line="+1"/>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts Changed

@@ -33,7 +33,7 @@
 <context>
 <name>ADM_Composer</name>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
 <source>Cannot find a demuxer for %s</source>
 <translation type="unfinished"></translation>
 </message>
@@ -43,19 +43,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+26"/>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -554,7 +594,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -595,7 +635,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-112"/>
+ <location line="-128"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -605,7 +645,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -621,12 +661,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -649,12 +689,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -724,7 +764,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+19"/>
 <source>00:00:00.000</source>
 <translation type="unfinished"></translation>
 </message>
@@ -775,22 +815,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -826,7 +866,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -936,6 +976,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>SpiderMonkeyShell</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
@@ -979,6 +1027,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1007,7 +1060,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -1029,7 +1082,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1073,7 +1126,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="+444"/>
 <source>Output</source>
 <translation type="unfinished">Saida</translation>
 </message>
@@ -1272,7 +1325,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+121"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
 <source>CPU</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1282,7 +1335,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1318,13 +1371,13 @@
 </message>
 <message>
 <location line="+23"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1421,7 +1474,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1441,12 +1494,17 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1457,11 +1515,6 @@
 </message>
 <message>
 <location line="+1"/>
- <source>Create _OpenDML files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
 <source>_Revert to saved default output settings on video load</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1589,17 +1642,17 @@
 </message>
 <message>
 <location line="+5"/>
- <source>_Split MPEG files every (MB):</source>
+ <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
- <source>_Use alternative tag for MP3 in .mp4</source>
+ <location line="+1"/>
+ <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
- <source>_Default to the directory of the last read file for saving</source>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -1665,7 +1718,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1755,12 +1808,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Threading</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1796,7 +1850,7 @@
 </message>
 <message>
 <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+125"/>
+ <location filename="../../common/gui_save.cpp" line="+282"/>
 <location line="+10"/>
 <source>Queue</source>
 <translation type="unfinished"></translation>
@@ -1813,11 +1867,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1927,12 +1991,17 @@
 </message>
 <message>
 <location line="+1"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2"/>
+ <location line="-8"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2052,25 +2121,25 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="+1330"/>
+ <location filename="../../common/gui_main.cpp" line="+1407"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
 <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="-64"/>
+ <location filename="../../common/gui_save.cpp" line="-109"/>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-42"/>
- <location line="+42"/>
+ <location line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -2158,7 +2227,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2183,7 +2252,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+97"/>
+ <location line="+101"/>
 <source>Not coded in this version</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2209,22 +2278,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+159"/>
+ <location line="+114"/>
+ <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"/>
 <source>Are you sure?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+47"/>
+ <location line="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
+ <location line="-20"/>
+ <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>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+16"/>
 <source>Error while cutting out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+72"/>
+ <location line="+8"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2319,7 +2425,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2365,7 +2471,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+138"/>
+ <location line="+141"/>
 <source>AvsProxy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2406,12 +2512,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-327"/>
+ <location filename="../../common/gui_save.cpp" line="-445"/>
 <source>No</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2471,6 +2577,11 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+9"/>
 <source>Select File to Save</source>
 <translation type="unfinished"></translation>
@@ -2497,48 +2608,58 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
- <source>Saving as set of jpegs</source>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Cannot decode frame</source>
+ <location line="+20"/>
+ <source>Warning</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Aborting.</source>
+ <source>Maximum number of 9999 images reached, aborting.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
- <source>Done</source>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-38"/>
- <source>Saved %d images.</source>
+ <location line="+32"/>
+ <source>PNG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Could not save all images.</source>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="-34"/>
+ <location line="+83"/>
+ <source>Done</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-83"/>
+ <source>Saved %d images.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+63"/>
 <source>BMP op failed</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2548,7 +2669,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3003,28 +3124,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
- <source>Too short</source>
+ <location line="+165"/>
+ <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 line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
+ <location line="+6"/>
+ <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -3120,7 +3241,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -3148,6 +3269,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -3514,16 +3679,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3625,7 +3790,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3635,7 +3800,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3829,7 +3994,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3839,8 +4004,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3950,7 +4115,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -3961,6 +4126,11 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -3972,40 +4142,50 @@
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -4204,13 +4384,13 @@
 <name>encodingDialog</name>
 <message>
 <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+70"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Nenhuma</translation>
 </message>
 <message>
- <location line="-257"/>
+ <location line="-245"/>
 <source>Encoding...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4221,25 +4401,22 @@
 </message>
 <message>
 <location line="+11"/>
- <location line="+223"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-193"/>
+ <location line="-187"/>
 <source>Phase:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <source>Time Remaining:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+11"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4290,111 +4467,81 @@
 </message>
 <message>
 <location line="+53"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <source>Audio Codec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Container:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+16"/>
- <source>Video Codec:</source>
+ <location line="+41"/>
+ <source>Audio Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+7"/>
+ <source>Total Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Video Size:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+7"/>
- <location line="+17"/>
- <source>0 MB</source>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+17"/>
+ <source>Processed Frames:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+7"/>
+ <source>Quantiser:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+37"/>
- <location line="+51"/>
- <source>0</source>
+ <location line="+48"/>
+ <source>Elapsed:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-78"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Frames/sec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="-199"/>
+ <source>Video Codec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>0 kB/s</source>
+ <location line="+48"/>
+ <location line="+7"/>
+ <location line="+14"/>
+ <source>0 MB</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+44"/>
+ <location line="+31"/>
+ <location line="+48"/>
+ <source>0</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>00:00:00</source>
+ <location line="-55"/>
+ <source>0 kB/s</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+48"/>
+ <source>00:00:00</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -4411,7 +4558,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4477,46 +4624,51 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4536,18 +4688,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -5063,8 +5215,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -5105,6 +5257,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -5113,6 +5280,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -5126,7 +5298,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5266,6 +5458,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -6008,7 +6258,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -6353,6 +6603,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -6383,18 +6638,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -6587,12 +6842,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6602,7 +6857,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6681,7 +6941,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6689,7 +6949,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished"></translation>
@@ -6705,7 +6965,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6715,7 +6975,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6725,6 +6985,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -6907,12 +7177,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6975,7 +7245,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6988,13 +7258,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -7134,7 +7404,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7163,18 +7433,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7199,7 +7469,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7219,7 +7489,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7277,7 +7547,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7287,7 +7557,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7352,7 +7622,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -7363,7 +7633,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7511,7 +7781,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7551,7 +7821,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7587,7 +7857,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7603,12 +7873,12 @@
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+29"/>
+ <location line="+30"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7684,7 +7954,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-134"/>
+ <location line="-150"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7854,7 +8124,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+274"/>
+ <location line="+277"/>
 <source>_Mode:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7872,7 +8142,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <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>
 </message>
@@ -7935,7 +8205,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -7952,8 +8221,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -7978,8 +8245,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8004,8 +8269,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -8029,7 +8292,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -8043,7 +8305,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -8390,6 +8668,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>swapuv</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
@@ -8556,6 +8858,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -8569,16 +8889,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished"></translation>
@@ -8600,7 +8920,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8649,6 +8969,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -8682,24 +9023,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -8956,7 +9279,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9002,7 +9325,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -9016,7 +9339,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -9423,7 +9746,7 @@
 </message>
 <message>
 <location line="+20"/>
- <source>10 (Best)</source>
+ <source>11 (Best)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -10304,7 +10627,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10431,12 +10754,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10616,12 +10939,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -10658,12 +10981,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10961,7 +11284,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -2293,7 +2293,7 @@
 <translation type="obsolete">Файл идентифицирован, но не поддерживается.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Ошибка при открытии %s!</translation>
 </message>
@@ -2349,7 +2349,37 @@
 <translation type="unfinished">Невозможно найти демультиплексор для %s</translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
@@ -2358,12 +2388,22 @@
 2.) склеить их вместе</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished">Проверка правильности временных меток...</translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -3338,7 +3378,7 @@
 <translation type="obsolete">&lt;b&gt;Видео&lt;/b&gt;</translation>
 </message>
 <message>
- <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+483"/>
+ <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+485"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Копировать</translation>
@@ -3393,7 +3433,7 @@
 <translation type="obsolete">Выделено</translation>
 </message>
 <message>
- <location line="-1194"/>
+ <location line="-1196"/>
 <source>&amp;Help</source>
 <translation type="unfinished">Сп&amp;равка</translation>
 </message>
@@ -3454,7 +3494,7 @@
 <translation type="obsolete">&amp;Авто</translation>
 </message>
 <message>
- <location line="+1545"/>
+ <location line="+1544"/>
 <source>&amp;Open...</source>
 <translation type="unfinished">&amp;Открыть...</translation>
 </message>
@@ -3519,7 +3559,7 @@
 <translation type="obsolete">Сохранить JPEG картинку</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished">&amp;Загрузить/Запустить проект...</translation>
 </message>
@@ -3806,17 +3846,17 @@
 <translation type="unfinished">&amp;Сверху</translation>
 </message>
 <message>
- <location line="-1641"/>
+ <location line="-1650"/>
 <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
 <translation>&lt;b&gt;Декодер видео&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+1125"/>
+ <location line="+1126"/>
 <source>Frame type:</source>
 <translation type="unfinished">Тип кадра:</translation>
 </message>
 <message>
- <location line="+504"/>
+ <location line="+512"/>
 <source>&amp;Separate</source>
 <translation type="unfinished">&amp;Отделить</translation>
 </message>
@@ -3825,7 +3865,7 @@
 <translation type="obsolete">&amp;Закрыть</translation>
 </message>
 <message>
- <location line="-1872"/>
+ <location line="-1883"/>
 <source>Avidemux</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3845,7 +3885,7 @@
 <translation type="unfinished">&amp;Недавно</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished">На&amp;стройки кодека</translation>
 </message>
@@ -3865,7 +3905,7 @@
 <translation type="unfinished">&lt;b&gt;Видео на выходе&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished">&lt;b&gt;Аудио на выходе&lt;/b&gt;</translation>
 </message>
@@ -3875,7 +3915,7 @@
 <translation type="unfinished"> (0 дорожек)</translation>
 </message>
 <message>
- <location line="+161"/>
+ <location line="+177"/>
 <source>ms</source>
 <translation type="unfinished">мс</translation>
 </message>
@@ -3886,12 +3926,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished">&amp;Навигация</translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished">Воспроизвести [SPACE]</translation>
 </message>
@@ -3914,12 +3954,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished">Предыдущий кадр [LEFT]</translation>
 </message>
@@ -3984,7 +4024,7 @@
 <translation type="unfinished">Вперед на 1 минуту</translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+77"/>
 <source>00:00:00.000</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4030,22 +4070,26 @@
 <translation type="unfinished">Перейти к маркеру B [PAGE DOWN]</translation>
 </message>
 <message>
- <location line="+10"/>
 <source>Display output video on playback</source>
- <translation type="unfinished">Отображать видео на выходе при воспроизведении</translation>
+ <translation type="obsolete">Отображать видео на выходе при воспроизведении</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+213"/>
 <source>Play filtered</source>
 <translation type="unfinished">Включить фильтр</translation>
 </message>
 <message>
- <location line="+25"/>
+ <location line="-172"/>
 <source>Vol&amp;ume</source>
 <translation type="unfinished">&amp;Громкость</translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished">&amp;Аудиометр</translation>
 </message>
@@ -4060,7 +4104,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+69"/>
 <source>F7</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4264,6 +4308,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -4374,6 +4426,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4453,7 +4510,7 @@
 </message>
 <message>
 <location line="+29"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -4475,7 +4532,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished">Слева:</translation>
 </message>
@@ -4542,7 +4599,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation>Декодировать видео посредством DXVA2 (Windows)</translation>
 </message>
@@ -4551,14 +4608,13 @@
 <translation type="obsolete">Минимизировать в трей во время кодирования</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">_Разрешать нестандартную частоту звука для DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">Создавать файлы _OpenDML</translation>
+ <translation type="obsolete">Создавать файлы _OpenDML</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -4678,16 +4734,21 @@
 <translation type="unfinished">Приоритет</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished">_Использовать альтернативные тэги для MP3 в .MP4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished">В режиме _копирования повысить равномерность отметок времени декодирования (DTS)</translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (лучшее)</translation>
@@ -4785,10 +4846,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Звук</translation>
 </message>
@@ -4801,12 +4862,12 @@
 <translation type="unfinished">Видео</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+34"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+39"/>
 <source>Threading</source>
 <translation type="unfinished">Многопоточность</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
 <source>Pr&amp;eferences</source>
 <translation>&amp;Настройки</translation>
 </message>
@@ -4837,7 +4898,7 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">Фильтры</translation>
 </message>
@@ -4965,7 +5026,7 @@
 <translation type="unfinished">Ошибка аудиокодера</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Нет в этой версии</translation>
 </message>
@@ -4978,12 +5039,41 @@
 <translation type="obsolete">Выберите файл для присоединения</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Вы уверены?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">Ошибка прав доступа</translation>
 </message>
@@ -5080,7 +5170,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">Ошибка при открытии файла для записи</translation>
 </message>
@@ -5095,7 +5185,7 @@
 <translation type="unfinished">Главная звуковая дорожка</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>Failed to connect to avsproxy.
 Is it running ?</source>
 <translation type="unfinished">Невозможно соединиться с AvsProxy.
@@ -5117,7 +5207,7 @@
 <translation type="unfinished">Дамп кадра</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+34"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
 <source>Go to Time</source>
 <translation type="unfinished">Переход</translation>
 </message>
@@ -5132,7 +5222,7 @@
 <translation type="unfinished">Поменять U и V</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Выберите файл для сохранения</translation>
 </message>
@@ -5157,7 +5247,7 @@
 <translation type="unfinished">Выберите файл для сохранения</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation type="unfinished">Укажите файл для сохранения</translation>
 </message>
@@ -5167,39 +5257,36 @@
 <translation type="unfinished">Сохранение аудио</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Сохранение как jpeg</translation>
+ <translation type="obsolete">Сохранение как jpeg</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">Невозможно декодировать кадр</translation>
+ <translation type="obsolete">Невозможно декодировать кадр</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">Прервано.</translation>
+ <translation type="obsolete">Прервано.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Выполнено</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">Сохранено изображений: %d </translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -5210,12 +5297,11 @@
 <translation type="unfinished">Ошибка</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">Невозможно сохранить все изображения.</translation>
+ <translation type="obsolete">Невозможно сохранить все изображения.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Ошибка открытия BMP</translation>
 </message>
@@ -5225,7 +5311,7 @@
 <translation type="unfinished">Ошибка сохранения &quot;%s&quot; как BMP.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">Файл &quot;%s&quot; успешно сохранен.</translation>
 </message>
@@ -5588,7 +5674,7 @@
 <translation type="unfinished">_Дерингинг</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-269"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-273"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished">Декодировать видео с помощью VDPAU (NVIDIA)</translation>
 </message>
@@ -5603,17 +5689,22 @@
 <translation type="unfinished">Декодировать видео с помощью LIBVA (INTEL)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished">Декодировать видео с помощью VideoToolbox (macOS)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>Enable openGl support</source>
 <translation type="unfinished">Включить поддержку OpenGL</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
 <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished">При включении аппаратного ускорения лучше использовать подходящий видеодрайвер</translation>
 </message>
 <message>
- <location line="+8"/>
+ <location line="+7"/>
 <source>_Check for new release</source>
 <translation>_Проверять обновления</translation>
 </message>
@@ -5623,12 +5714,11 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+52"/>
 <source>_Split MPEG files every (MB):</source>
- <translation type="unfinished">_Разделять файлы MPEG через каждые (Мб)</translation>
+ <translation type="obsolete">_Разделять файлы MPEG через каждые (Мб)</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+62"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished">VDPAU (лучшее)</translation>
 </message>
@@ -5650,7 +5740,7 @@
 </message>
 <message>
 <location line="+15"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5710,12 +5800,13 @@
 <translation type="unfinished">Монитор</translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished">Аппаратное ускорение</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished">_Всегда выбирать порт</translation>
 </message>
@@ -5725,7 +5816,7 @@
 <translation type="unfinished">Порт по умолчанию</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-96"/>
 <source>Open</source>
 <translation>&amp;Открыть...</translation>
 </message>
@@ -5758,11 +5849,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished">Сохранить как JPEG</translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation>&amp;Закрыть файл</translation>
 </message>
@@ -5846,7 +5947,12 @@
 <translation type="unfinished">Постпроцессинг</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished">Выбрать дорожку...</translation>
 </message>
@@ -5941,8 +6047,8 @@
 <translation type="unfinished">Масштаб 2:1</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished">Нельзя удалить все видео</translation>
@@ -6025,7 +6131,7 @@
 Он требуется для создания видео, совместимого с PSP.</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished">Выбрать скрипт/проект для запуска</translation>
 </message>
@@ -6050,7 +6156,7 @@
 <translation>Вы собираетесь очистить список недавно открытых файлов и проектов. Этот шаг необратим. Продолжить?</translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished">Выбрать файл видео...</translation>
@@ -6071,7 +6177,15 @@
 <translation type="unfinished">Выбрать файл видео для присоединения...</translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished">Обрезка</translation>
 </message>
@@ -6081,7 +6195,7 @@
 <translation type="unfinished">Ошибка обрезки</translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished">Неверный индекс аудио</translation>
@@ -6112,7 +6226,7 @@
 <translation type="unfinished">Установка языка дорожки невозможна: неверный индекс дорожки!</translation>
 </message>
 <message>
- <location line="+138"/>
+ <location line="+141"/>
 <source>AvsProxy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6132,12 +6246,12 @@
 <translation type="unfinished">Функция отключена или более недействительна</translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Проблема при инициализации аудиоустройства.</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation type="unfinished">Нет</translation>
 </message>
@@ -6172,7 +6286,12 @@
 <translation type="unfinished">Добавить операцию в очередь</translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished">Функция не включена</translation>
@@ -6188,17 +6307,51 @@
 <translation type="unfinished">Ошибка при сохранении</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <source>Fail to save as jpeg</source>
- <translation type="unfinished">Не удалось сохранить в JPEG</translation>
+ <translation type="obsolete">Не удалось сохранить в JPEG</translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished">Невозможно запустить движок скрипта tinyPy</translation>
 </message>
@@ -6609,29 +6762,33 @@
 <translation type="unfinished">Неизвестный кодек</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished">Создание временной карты</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Ошибка выделения памяти</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished">Сохранение</translation>
 </message>
 <message>
- <location line="+142"/>
+ <location line="+165"/>
+ <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 line="+6"/>
 <source>Too short</source>
 <translation type="unfinished">Слишком коротко</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished">Видео сохранено, но возможно, что оно неполное.</translation>
+ <translation type="obsolete">Видео сохранено, но возможно, что оно неполное.</translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
@@ -6731,7 +6888,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -6760,6 +6917,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -7136,16 +7337,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">_Время начала (мс):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Начальное время:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">В_ремя начала (мс):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Конечное время:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished">Заменить черным</translation>
 </message>
@@ -7314,7 +7515,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished">Изменить кадры/c</translation>
 </message>
@@ -7324,7 +7525,7 @@
 <translation type="unfinished">Ускорение/замедление видео при изменении кадров/c. Этот фильтр изменяет продолжительность видео.</translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished">Кадры/с источника:</translation>
 </message>
@@ -7523,13 +7724,13 @@
 <message>
 <location line="-1"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Контраст</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished">Яркость</translation>
 </message>
@@ -7649,7 +7850,7 @@
 <translation>Фильтр кадрирования</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation>Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
@@ -7662,6 +7863,11 @@
 <translation>Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
 </translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
@@ -7673,40 +7879,50 @@
 </message>
 <message>
 <location line="+88"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+88"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
 <source>Reset</source>
 <translation>Сброс</translation>
 </message>
 <message>
 <location line="+58"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+58"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+81"/>
 <source>Auto Crop</source>
 <translation>Автокадрирование</translation>
 </message>
 <message>
 <location line="-108"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-108"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-44"/>
 <source>Right:</source>
 <translation>Справа:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation>Сверху:</translation>
 </message>
 <message>
 <location line="+64"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Bottom:</source>
 <translation>Снизу:</translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation>Слева:</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+58"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -7920,50 +8136,73 @@
 <translation type="unfinished">Кодирование...</translation>
 </message>
 <message>
- <location line="+57"/>
+ <location line="+51"/>
 <source>Phase:</source>
 <translation type="unfinished">Этап:</translation>
 </message>
 <message>
- <location line="+223"/>
+ <location line="+180"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>Video Codec:</source>
 <translation type="unfinished">Кодек видео:</translation>
 </message>
 <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="-215"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Не нужно</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Неизвестно</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="+55"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+72"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
+ <location line="-393"/>
 <source>Time Remaining:</source>
- <translation type="obsolete">Осталось времени:</translation>
+ <translation type="unfinished">Осталось времени:</translation>
 </message>
 <message>
+ <location line="+242"/>
 <source>Total Size:</source>
- <translation type="obsolete">Общий размер:</translation>
+ <translation type="unfinished">Общий размер:</translation>
 </message>
 <message>
+ <location line="+21"/>
 <source>Video Size:</source>
- <translation type="obsolete">Размер видео:</translation>
+ <translation type="unfinished">Размер видео:</translation>
 </message>
 <message>
- <location line="-415"/>
+ <location line="-252"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">Выключить после завершения</translation>
 </message>
@@ -8013,115 +8252,47 @@
 <translation type="unfinished">Дополнительно</translation>
 </message>
 <message>
- <location line="-171"/>
- <source>Main</source>
- <translation type="unfinished">Главный</translation>
- </message>
- <message>
- <location line="+48"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+204"/>
+ <source>Processed Frames:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+7"/>
+ <source>Quantiser:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+48"/>
+ <source>Elapsed:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <location line="+21"/>
+ <source>Frames/sec:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <location line="-442"/>
+ <source>Main</source>
+ <translation type="unfinished">Главный</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+291"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 Мб</translation>
 </message>
 <message>
- <location line="-10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 Кб/с</translation>
 </message>
 <message>
- <location line="+41"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+48"/>
 <source>00:00:00</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+14"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -8163,7 +8334,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8233,6 +8404,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished">Настройка Faac</translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -8264,41 +8440,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished">Затемнение </translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished">Затемнить.</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">Начальное время (мс)</translation>
+ <location line="+18"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Начальное время:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">_Конечное время (мс)</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Конечное время:</translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished">Затемнение до черного</translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished">Затемнить до черного (появление/исчезание).</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Вывод</translation>
 </message>
@@ -8318,19 +8494,19 @@
 <translation type="unfinished">Появление</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">_Тип затемнения:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished">_Начальное время (мс):</translation>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Начальное время:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished">_Конечное время (мс):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Конечное время:</translation>
 </message>
 </context>
 <context>
@@ -8845,8 +9021,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished">Низкое качество</translation>
@@ -8887,6 +9063,21 @@
 <translation type="unfinished">Низкий отклик (высокое качество)</translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -8895,6 +9086,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -8908,7 +9104,27 @@
 <translation type="unfinished">Максимальный битрейт (Кб/с):</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9056,6 +9272,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -9835,8 +10109,8 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
- <translation type="unfinished">использовать версию QT4</translation>
+ <source>use Qt version</source>
+ <translation type="unfinished">использовать версию Qt</translation>
 </message>
 <message>
 <location line="+20"/>
@@ -10329,6 +10603,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished">Выбрать изображение для логотипа</translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -10359,18 +10638,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
 <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
- <translation type="unfinished">Альфа-канал будет пропущен, если он уже есть в изображении (png в RGB)</translation>
+ <translation type="obsolete">Альфа-канал будет пропущен, если он уже есть в изображении (png в RGB)</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+20"/>
 <source>Alpha</source>
 <translation type="unfinished">Альфа</translation>
 </message>
 <message>
+ <location line="+20"/>
+ <source>Fade-in/out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished">Щелкните на изображение для установки логотипа</translation>
 </message>
 </context>
@@ -10622,12 +10905,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Сохранение в MKV</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished">Принудительная ширина монитора</translation>
 </message>
@@ -10637,7 +10920,12 @@
 <translation type="unfinished">Ширина монитора</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10720,7 +11008,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Ошибка чтения заголовков SVQ3</translation>
 </message>
@@ -10732,7 +11020,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">Не поддерживается</translation>
@@ -10752,7 +11040,7 @@
 <translation type="obsolete">Для аудио поддерживаются только AAC, AC3 и mpegaudio</translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Сохранение в MP4</translation>
 </message>
@@ -10762,7 +11050,7 @@
 <translation type="unfinished">Сохранение в формате PSP</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished">Формат мультиплексирования</translation>
 </message>
@@ -10772,6 +11060,16 @@
 <translation type="unfinished">Использовать альтернативные тэги для MP3</translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -10975,12 +11273,12 @@
 <translation type="unfinished">Невозможно перейти к предыдущему ключевому кадру</translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished">Перейти</translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Ошибка</translation>
 </message>
@@ -11077,7 +11375,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Заголовок неверной формы</translation>
 </message>
@@ -11090,14 +11388,14 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
- <translation type="unfinished">Начальное время (мс):</translation>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_Начальное время:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
- <translation type="unfinished">Конечное время (мс):</translation>
+ <source>_End time:</source>
+ <translation type="unfinished">_Конечное время:</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -11271,7 +11569,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Ошибка</translation>
 </message>
@@ -11301,18 +11599,18 @@
 <translation type="unfinished">Выбрать файл аудио</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Ошибка</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished">Невозможно использовать файл как аудиодорожку</translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished">Некоторые дорожки использованы несколько раз</translation>
 </message>
@@ -11337,7 +11635,7 @@
 <translation type="unfinished">.... Добавить аудиодорожку</translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished">Копировать</translation>
 </message>
@@ -11357,7 +11655,7 @@
 <translation type="unfinished">Для выполнения этой операции требуются права root.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11415,7 +11713,7 @@
 <translation>&lt;b&gt;Новая версия&lt;/b&gt;&lt;br&gt;Версия %1&lt;br&gt;Выпущена %2.&lt;br&gt;Доступна для загрузки с адреса&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Вы можете отключить автоматическую проверку обновлений в настройках.&lt;/small&gt;</translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished">Предыдущие файлы</translation>
 </message>
@@ -11425,7 +11723,7 @@
 <translation type="unfinished">Предыдущие проекты</translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished">Старт/стоп</translation>
 </message>
@@ -11490,7 +11788,7 @@
 <translation>Вперед на 1 минуту</translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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">Приложение столкнулось с критической проблемой
@@ -11502,7 +11800,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"> (%d дорожек)</translation>
 </message>
@@ -11650,7 +11948,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Частичное наложение</translation>
 </message>
@@ -11690,7 +11988,7 @@
 <translation type="unfinished">Сделать частичным</translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished">Загрузить фильтры видео...</translation>
 </message>
@@ -11726,7 +12024,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">Нет</translation>
 </message>
@@ -11746,7 +12044,7 @@
 <translation type="unfinished">Стерео</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation>Видео</translation>
 </message>
@@ -11822,18 +12120,18 @@
 <translation>Без звука</translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished">%2.3f кадров/с</translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation>%02d:%02d:%02d,%03d</translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11955,7 +12253,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Режим:</translation>
 </message>
@@ -11970,7 +12268,7 @@
 <translation type="unfinished">Изменить fps</translation>
 </message>
 <message>
- <location line="-322"/>
+ <location line="-325"/>
 <source>Custom</source>
 <translation type="unfinished">Вручную</translation>
 </message>
@@ -12013,7 +12311,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <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>
 </message>
@@ -12046,7 +12344,23 @@
 <translation type="unfinished">Изменить размер</translation>
 </message>
 <message>
- <location line="+435"/>
+ <location line="+39"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+341"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+435"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+435"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+435"/>
@@ -12061,7 +12375,7 @@
 <translation type="unfinished">Бикубическая</translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -12091,7 +12405,6 @@
 <translation type="unfinished">Фиксировать соотношение сторон</translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -12108,8 +12421,6 @@
 <message>
 <location line="+8"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
@@ -12134,8 +12445,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -12160,8 +12469,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -12185,7 +12492,6 @@
 </message>
 <message>
 <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
@@ -12199,7 +12505,7 @@
 <translation type="unfinished">Приемник:</translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+81"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -12566,6 +12872,38 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished">Стоп-кадр</translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished">Повторять кадр в течение заданного времени.</translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Start time:</source>
+ <translation type="obsolete">_Начальное время:</translation>
+ </message>
+ <message>
+ <source>Duration:</source>
+ <translation type="obsolete">_Продолжительность:</translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -12764,6 +13102,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation> ч</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation> мин</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation> с</translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -12778,16 +13134,16 @@
 Пожалуйста, удалите файл idx2 и откройте заново.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished">Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Индексирование</translation>
@@ -12809,7 +13165,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12858,6 +13214,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -12891,24 +13268,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -13241,7 +13600,7 @@
 <translation type="unfinished">этот режим еще не разработан</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished">нет</translation>
 </message>
@@ -13287,7 +13646,7 @@
 <translation type="unfinished">Средний битрейт:</translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -13305,7 +13664,7 @@
 Вы хотите продолжить?</translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -13402,7 +13761,12 @@
 <translation type="unfinished">Гексагональный поиск</translation>
 </message>
 <message>
- <location line="+313"/>
+ <location line="+97"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+216"/>
 <location line="+450"/>
 <location line="+36"/>
 <source>Disabled</source>
@@ -13754,12 +14118,11 @@
 <translation type="unfinished">Субпиксельная точность</translation>
 </message>
 <message>
- <location line="+20"/>
 <source>10 (Best)</source>
- <translation type="unfinished">10 (Лучший)</translation>
+ <translation type="obsolete">10 (Лучший)</translation>
 </message>
 <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation type="unfinished">Вектор движения</translation>
 </message>
@@ -14600,7 +14963,7 @@
 <translation type="unfinished">Вручную</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished">Целевой битрейт</translation>
 </message>
@@ -14732,12 +15095,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished">Удалить</translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished">Общий</translation>
 </message>
@@ -14917,12 +15280,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished">Квантизатор</translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished">51 (низкое качество)</translation>
@@ -14959,12 +15322,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished">кадры</translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished">Идентификатор установки параметра последовательности:</translation>
 </message>
@@ -15263,7 +15626,12 @@
 <translation type="unfinished">Внешнее уменьшение шума:</translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished">Матрица квантизации</translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts Changed

@@ -2304,7 +2304,7 @@
 <translation type="obsolete">Можда се односи на неку стару датотеку са индексом.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Покушај да отворим %s није успео!</translation>
 </message>
@@ -2364,19 +2364,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -3327,7 +3367,7 @@
 <translation type="obsolete">&lt;b&gt;Видео&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Без измене</translation>
@@ -3368,7 +3408,7 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="+647"/>
+ <location line="+648"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -3415,7 +3455,7 @@
 <translation type="unfinished">Тип кадра:</translation>
 </message>
 <message>
- <location line="-1263"/>
+ <location line="-1266"/>
 <source>&amp;Help</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3475,7 +3515,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3491,7 +3531,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3501,7 +3541,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3517,12 +3557,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3545,12 +3585,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3620,7 +3660,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+82"/>
+ <location line="+83"/>
 <source>?</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3640,22 +3680,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3691,7 +3731,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4031,6 +4071,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -4185,6 +4233,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4261,7 +4314,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -4278,7 +4331,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4341,7 +4394,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4350,14 +4403,13 @@
 <translation type="obsolete">Смести у о_бавештајну зону панела приликом кодирања</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">_Дозволи нестандардне учестаности звука за ДВД</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">Направи OpenDML _датотеке</translation>
+ <translation type="obsolete">Направи OpenDML _датотеке</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -4482,16 +4534,21 @@
 <translation type="unfinished">Постављање приоритета</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished">Користи _алтернативни таг за MP3 у .mp4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (најбоље)</translation>
@@ -4533,7 +4590,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished">ПЦМ</translation>
 </message>
@@ -4615,10 +4672,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Звук</translation>
 </message>
@@ -4632,7 +4689,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">Процесори</translation>
 </message>
@@ -4647,7 +4704,7 @@
 <translation type="unfinished">Поставке</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+42"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -4660,7 +4717,7 @@
 </message>
 <message>
 <location line="+23"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">Филтери</translation>
 </message>
@@ -4828,7 +4885,7 @@
 <translation type="unfinished">Грешка у кодецима</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Није кодирано у овој верзији</translation>
 </message>
@@ -4841,12 +4898,41 @@
 <translation type="obsolete">Изабери датотеку да додам...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Да ли си сигуран?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">Грешка са дозволама</translation>
 </message>
@@ -4942,7 +5028,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">Нешто лоше се десило</translation>
 </message>
@@ -4957,7 +5043,7 @@
 <translation type="unfinished">Главна звучна стаза</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">AvsProxy</translation>
 </message>
@@ -5004,7 +5090,7 @@
 <translation type="unfinished">_Дерингинг</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">Изабери датотеку да сачувам тезгу</translation>
 </message>
@@ -5029,7 +5115,7 @@
 <translation type="unfinished">Изабери BMP за чување</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation type="unfinished">Изабери датотеку за чување</translation>
 </message>
@@ -5039,39 +5125,36 @@
 <translation type="unfinished">Снимам звук</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Снимање као сет JPEG sliка неуспело.</translation>
+ <translation type="obsolete">Снимање као сет JPEG sliка неуспело.</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">Не могу да декодирам кадар</translation>
+ <translation type="obsolete">Не могу да декодирам кадар</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">Обустављам.</translation>
+ <translation type="obsolete">Обустављам.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Завршено</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">Сачувано %d слика.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -5082,12 +5165,11 @@
 <translation type="unfinished">Грешка</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">Не могу да сачувам све слике</translation>
+ <translation type="obsolete">Не могу да сачувам све слике</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Рад над BMP неуспео</translation>
 </message>
@@ -5097,7 +5179,7 @@
 <translation type="unfinished">Снимање %s у BMP датотеку неуспело.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">Датотека %s је успешно сачувана.</translation>
 </message>
@@ -5288,7 +5370,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5378,7 +5460,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5393,27 +5475,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable openGl support</source>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>If you use Hw decoding, it is better to use the matching display driver</source>
+ <location line="+2"/>
+ <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
- <source>_Check for new release</source>
+ <location line="+2"/>
+ <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
- <source>_Split MPEG files every (MB):</source>
+ <location line="+7"/>
+ <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+65"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5469,12 +5551,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5484,7 +5567,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
 <source>Open</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5517,11 +5600,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5618,7 +5711,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5738,8 +5836,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -5816,7 +5914,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5841,7 +5939,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -5862,7 +5960,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5872,7 +5978,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -5903,7 +6009,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Упс...</translation>
 </message>
@@ -5913,12 +6019,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Проблеми при покретању звучне картице</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation type="unfinished">Не</translation>
 </message>
@@ -5953,7 +6059,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -5969,17 +6080,47 @@
 <translation type="unfinished">Грешка при снимању</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6401,28 +6542,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Грешка у меморији</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
- <source>Too short</source>
+ <location line="+165"/>
+ <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 line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
+ <location line="+6"/>
+ <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -6518,7 +6659,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -6546,6 +6687,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -6919,16 +7104,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7038,7 +7223,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7048,7 +7233,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7242,7 +7427,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Контраст</translation>
 </message>
@@ -7252,8 +7437,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7366,7 +7551,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -7377,51 +7562,66 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished">Поништи</translation>
 </message>
 <message>
 <location line="-88"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-38"/>
 <source>Crop</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+64"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -7640,48 +7840,103 @@
 </message>
 <message>
 <location line="+44"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Ништа</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Непознато</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 MB</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 kB/s</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">Угаси рачунар након завршеног посла</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation type="unfinished">Приоритет:</translation>
 </message>
@@ -7721,113 +7976,25 @@
 <translation type="unfinished">Напредније</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+35"/>
 <source>Phase:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="+94"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
+ <location line="+114"/>
 <source>Video Codec:</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -7869,7 +8036,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7943,6 +8110,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -7971,41 +8143,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Излаз</translation>
 </message>
@@ -8025,18 +8197,18 @@
 <translation type="unfinished">Бледи улаз</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">Тип _изблеђивања:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -8552,8 +8724,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -8594,6 +8766,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -8602,6 +8789,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -8615,7 +8807,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8755,6 +8967,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -9538,7 +9808,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -9997,6 +10267,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -10027,18 +10302,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -10254,12 +10529,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10269,7 +10544,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10348,7 +10628,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Проблем при читању SVQ3 заглавља</translation>
 </message>
@@ -10360,7 +10640,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">Није подржано</translation>
@@ -10376,7 +10656,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10386,7 +10666,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10396,6 +10676,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -10594,12 +10884,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Грешка</translation>
 </message>
@@ -10696,7 +10986,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Неисправно заглавље</translation>
 </message>
@@ -10709,13 +10999,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -10890,7 +11180,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Грешка</translation>
 </message>
@@ -10919,18 +11209,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Грешка</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10955,7 +11245,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10975,7 +11265,7 @@
 <translation type="unfinished">Администраторска овлашћења су потребна за извршавање ове операције.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11033,7 +11323,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11043,7 +11333,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11108,7 +11398,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -11119,7 +11409,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11267,7 +11557,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Половично</translation>
 </message>
@@ -11307,7 +11597,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11343,7 +11633,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">Не</translation>
 </message>
@@ -11363,7 +11653,7 @@
 <translation type="unfinished">Стерео</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11439,18 +11729,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11570,7 +11860,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Режим:</translation>
 </message>
@@ -11580,7 +11870,7 @@
 <translation type="unfinished">_Нова учестаност кадрова:</translation>
 </message>
 <message>
- <location line="-316"/>
+ <location line="-319"/>
 <source>Custom</source>
 <translation type="unfinished">Произвољно</translation>
 </message>
@@ -11620,7 +11910,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+281"/>
+ <location line="+284"/>
 <source>Resample fps</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11628,7 +11918,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <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>
 </message>
@@ -11661,8 +11951,6 @@
 <translation type="unfinished">Промени величину</translation>
 </message>
 <message>
- <location line="+50"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
@@ -11689,8 +11977,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -11715,8 +12001,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -11739,7 +12023,7 @@
 <translation type="unfinished">16:9</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
@@ -11799,7 +12083,7 @@
 <translation type="unfinished">Би-квадратни</translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -11829,7 +12113,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -11845,7 +12128,6 @@
 </message>
 <message>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+42"/>
@@ -11859,7 +12141,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -12177,6 +12475,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -12366,6 +12688,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -12379,16 +12719,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Правим индекс</translation>
@@ -12410,7 +12750,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12459,6 +12799,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -12492,24 +12853,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -12848,7 +13191,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12894,7 +13237,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12908,7 +13251,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -13132,7 +13475,12 @@
 <translation type="unfinished">31</translation>
 </message>
 <message>
- <location line="+1916"/>
+ <location line="+171"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1745"/>
 <source>Normal</source>
 <translation type="unfinished">Нормано</translation>
 </message>
@@ -13373,12 +13721,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>10 (Best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14200,7 +14543,7 @@
 <translation type="unfinished">Произвољно</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14327,12 +14670,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14512,12 +14855,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -14554,12 +14897,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14857,7 +15200,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts Changed

@@ -2304,7 +2304,7 @@
 <translation type="obsolete">Možda se odnosi na neku staru datoteku sa indeksom.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">Pokušaj da otvorim %s nije uspeo!</translation>
 </message>
@@ -2364,19 +2364,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -3327,7 +3367,7 @@
 <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Bez izmene</translation>
@@ -3368,7 +3408,7 @@
 <translation type="obsolete">/ 0</translation>
 </message>
 <message>
- <location line="+647"/>
+ <location line="+648"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -3415,7 +3455,7 @@
 <translation type="unfinished">Tip kadra:</translation>
 </message>
 <message>
- <location line="-1263"/>
+ <location line="-1266"/>
 <source>&amp;Help</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3475,7 +3515,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3491,7 +3531,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3501,7 +3541,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3517,12 +3557,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3545,12 +3585,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3620,7 +3660,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+82"/>
+ <location line="+83"/>
 <source>?</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3640,22 +3680,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3691,7 +3731,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4031,6 +4071,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -4185,6 +4233,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4261,7 +4314,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -4278,7 +4331,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4341,7 +4394,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4350,14 +4403,13 @@
 <translation type="obsolete">Smesti u o_baveštajnu zonu panela prilikom kodiranja</translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">_Dozvoli nestandardne učestanosti zvuka za DVD</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">Napravi OpenDML _datoteke</translation>
+ <translation type="obsolete">Napravi OpenDML _datoteke</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -4482,16 +4534,21 @@
 <translation type="unfinished">Postavljanje prioriteta</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished">Koristi _alternativni tag za MP3 u .mp4</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">XVideo (najbolje)</translation>
@@ -4533,7 +4590,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -4615,10 +4672,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Zvuk</translation>
 </message>
@@ -4632,7 +4689,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">Procesori</translation>
 </message>
@@ -4647,7 +4704,7 @@
 <translation type="unfinished">Postavke</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+42"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -4660,7 +4717,7 @@
 </message>
 <message>
 <location line="+23"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">Filteri</translation>
 </message>
@@ -4828,7 +4885,7 @@
 <translation type="unfinished">Greška u kodecima</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Nije kodirano u ovoj verziji</translation>
 </message>
@@ -4841,12 +4898,41 @@
 <translation type="obsolete">Izaberi datoteku da dodam...</translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">Da li si siguran?</translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">Greška sa dozvolama</translation>
 </message>
@@ -4942,7 +5028,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">Nešto loše se desilo</translation>
 </message>
@@ -4957,7 +5043,7 @@
 <translation type="unfinished">Glavna zvučna staza</translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">AvsProxy</translation>
 </message>
@@ -5004,7 +5090,7 @@
 <translation type="unfinished">_Deringing</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <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>
@@ -5029,7 +5115,7 @@
 <translation type="unfinished">Izaberi BMP za čuvanje</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation type="unfinished">Izaberi datoteku za čuvanje</translation>
 </message>
@@ -5039,39 +5125,36 @@
 <translation type="unfinished">Snimam zvuk</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Snimanje kao set JPEG slika neuspelo.</translation>
+ <translation type="obsolete">Snimanje kao set JPEG slika neuspelo.</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">Ne mogu da dekodiram kadar</translation>
+ <translation type="obsolete">Ne mogu da dekodiram kadar</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">Obustavljam.</translation>
+ <translation type="obsolete">Obustavljam.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Završeno</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">Sačuvano %d slika.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -5082,12 +5165,11 @@
 <translation type="unfinished">Greška</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">Ne mogu da sačuvam sve slike</translation>
+ <translation type="obsolete">Ne mogu da sačuvam sve slike</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">Rad nad BMP neuspeo</translation>
 </message>
@@ -5097,7 +5179,7 @@
 <translation type="unfinished">Snimanje %s u BMP datoteku neuspelo.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">Datoteka %s je uspešno sačuvana.</translation>
 </message>
@@ -5288,7 +5370,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5378,7 +5460,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5393,27 +5475,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable openGl support</source>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>If you use Hw decoding, it is better to use the matching display driver</source>
+ <location line="+2"/>
+ <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
- <source>_Check for new release</source>
+ <location line="+2"/>
+ <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
- <source>_Split MPEG files every (MB):</source>
+ <location line="+7"/>
+ <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+65"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5469,12 +5551,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5484,7 +5567,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
 <source>Open</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5517,11 +5600,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5618,7 +5711,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5738,8 +5836,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -5816,7 +5914,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5841,7 +5939,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -5862,7 +5960,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5872,7 +5978,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -5903,7 +6009,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Ups...</translation>
 </message>
@@ -5913,12 +6019,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Problemi pri pokretanju zvučne kartice</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation type="unfinished">Ne</translation>
 </message>
@@ -5953,7 +6059,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -5969,17 +6080,47 @@
 <translation type="unfinished">Greška pri snimanju</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6401,28 +6542,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Greška u memoriji</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
- <source>Too short</source>
+ <location line="+165"/>
+ <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 line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
+ <location line="+6"/>
+ <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -6518,7 +6659,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -6546,6 +6687,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -6919,16 +7104,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7038,7 +7223,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7048,7 +7233,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7242,7 +7427,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Kontrast</translation>
 </message>
@@ -7252,8 +7437,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7366,7 +7551,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -7377,51 +7562,66 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished">Poništi</translation>
 </message>
 <message>
 <location line="-88"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-38"/>
 <source>Crop</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+64"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -7640,48 +7840,103 @@
 </message>
 <message>
 <location line="+44"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Ništa</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">Nepoznato</translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">0 MB</translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation type="unfinished">0 kB/s</translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">Ugasi računar nakon završenog posla</translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation type="unfinished">Prioritet:</translation>
 </message>
@@ -7721,113 +7976,25 @@
 <translation type="unfinished">Naprednije</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+35"/>
 <source>Phase:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="+94"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
+ <location line="+114"/>
 <source>Video Codec:</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -7869,7 +8036,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7943,6 +8110,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -7971,41 +8143,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Izlaz</translation>
 </message>
@@ -8025,18 +8197,18 @@
 <translation type="unfinished">Bledi ulaz</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">Tip _izbleđivanja:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -8552,8 +8724,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -8594,6 +8766,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -8602,6 +8789,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -8615,7 +8807,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8755,6 +8967,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -9538,7 +9808,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -9997,6 +10267,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -10027,18 +10302,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -10254,12 +10529,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10269,7 +10544,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10348,7 +10628,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">Problem pri čitanju SVQ3 zaglavlja</translation>
 </message>
@@ -10360,7 +10640,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">Nije podržano</translation>
@@ -10376,7 +10656,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10386,7 +10666,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10396,6 +10676,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -10594,12 +10884,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Greška</translation>
 </message>
@@ -10696,7 +10986,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Neispravno zaglavlje</translation>
 </message>
@@ -10709,13 +10999,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -10890,7 +11180,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Greška</translation>
 </message>
@@ -10919,18 +11209,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Greška</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10955,7 +11245,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10975,7 +11265,7 @@
 <translation type="unfinished">Administratorska ovlašćenja su potrebna za izvršavanje ove operacije.</translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11033,7 +11323,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11043,7 +11333,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11108,7 +11398,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -11119,7 +11409,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11267,7 +11557,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Polovično</translation>
 </message>
@@ -11307,7 +11597,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11343,7 +11633,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">Ne</translation>
 </message>
@@ -11363,7 +11653,7 @@
 <translation type="unfinished">Stereo</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11439,18 +11729,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11570,7 +11860,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Režim:</translation>
 </message>
@@ -11580,7 +11870,7 @@
 <translation type="unfinished">_Nova učestanost kadrova:</translation>
 </message>
 <message>
- <location line="-316"/>
+ <location line="-319"/>
 <source>Custom</source>
 <translation type="unfinished">Proizvoljno</translation>
 </message>
@@ -11620,7 +11910,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+281"/>
+ <location line="+284"/>
 <source>Resample fps</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11628,7 +11918,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Visina i širina ne mogu biti neparni brojevi</translation>
 </message>
@@ -11661,8 +11951,6 @@
 <translation type="unfinished">Promeni veličinu</translation>
 </message>
 <message>
- <location line="+50"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
@@ -11689,8 +11977,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -11715,8 +12001,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -11739,7 +12023,7 @@
 <translation type="unfinished">16:9</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
@@ -11799,7 +12083,7 @@
 <translation type="unfinished">Bi-kvadratni</translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -11829,7 +12113,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -11845,7 +12128,6 @@
 </message>
 <message>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+42"/>
@@ -11859,7 +12141,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -12177,6 +12475,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -12366,6 +12688,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -12379,16 +12719,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">Pravim indeks</translation>
@@ -12410,7 +12750,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12459,6 +12799,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -12492,24 +12853,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -12848,7 +13191,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12894,7 +13237,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12908,7 +13251,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -13132,7 +13475,12 @@
 <translation type="unfinished">31</translation>
 </message>
 <message>
- <location line="+1916"/>
+ <location line="+171"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1745"/>
 <source>Normal</source>
 <translation type="unfinished">Normano</translation>
 </message>
@@ -13373,12 +13721,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>10 (Best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14200,7 +14543,7 @@
 <translation type="unfinished">Proizvoljno</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14327,12 +14670,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14512,12 +14855,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -14554,12 +14897,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14857,7 +15200,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts Changed

@@ -2571,7 +2571,7 @@
 <translation type="obsolete">Eski bir endeks dosyasıyla ilgili olabilir.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
 <source>Attempt to open %s failed!</source>
 <translation type="unfinished">%s açma teşebbüsü başarısız oldu!</translation>
 </message>
@@ -2631,19 +2631,59 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+62"/>
+ <location line="+58"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
 <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
 <source>Checking if timestamps are valid..</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+115"/>
 <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -3625,7 +3665,7 @@
 <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
 </message>
 <message>
- <location line="+468"/>
+ <location line="+470"/>
 <location line="+169"/>
 <source>Copy</source>
 <translation type="unfinished">Kopyala</translation>
@@ -3667,7 +3707,7 @@
 {0?}</translation>
 </message>
 <message>
- <location line="+647"/>
+ <location line="+648"/>
 <source>00:00:00.000</source>
 <translation type="unfinished">00:00:00.000</translation>
 </message>
@@ -3718,7 +3758,7 @@
 </translation>
 </message>
 <message>
- <location line="-1263"/>
+ <location line="-1266"/>
 <source>&amp;Help</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3778,7 +3818,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location line="+46"/>
 <source>Codec O&amp;ptions</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3794,7 +3834,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+176"/>
+ <location line="+160"/>
 <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3804,7 +3844,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
+ <location line="+145"/>
 <source>&amp;Shift:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3820,12 +3860,12 @@
 </message>
 <message>
 <location line="+114"/>
- <location line="+937"/>
+ <location line="+946"/>
 <source>&amp;Navigation</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-862"/>
+ <location line="-871"/>
 <source>Play [SPACE]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3848,12 +3888,12 @@
 <location line="+23"/>
 <location line="+23"/>
 <location line="+26"/>
- <location line="+344"/>
+ <location line="+341"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-606"/>
+ <location line="-603"/>
 <source>Go to previous frame [LEFT]</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3923,7 +3963,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+82"/>
+ <location line="+83"/>
 <source>?</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3943,22 +3983,22 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
+ <location line="+213"/>
+ <source>Play filtered</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
+ <location line="-172"/>
+ <source>Vol&amp;ume</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
+ <location line="-25"/>
+ <source>Selection: 000000</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+89"/>
+ <location line="+114"/>
 <source>Audio &amp;Metre</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3994,7 +4034,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+21"/>
 <source>&amp;Load/Run Project...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4359,6 +4399,14 @@
 </message>
 </context>
 <context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>QObject</name>
 <message>
 <source>Alert</source>
@@ -4529,6 +4577,11 @@
 </message>
 <message>
 <location line="+11"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
 <source>...</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4609,7 +4662,7 @@
 </message>
 <message>
 <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
+ <source>© 2001 - 2018 Mean</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -4626,7 +4679,7 @@
 <context>
 <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
 <source>_Left border:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4693,7 +4746,7 @@
 <context>
 <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+219"/>
 <source>Decode video using DXVA2 (windows)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4703,15 +4756,14 @@
 </translation>
 </message>
 <message>
- <location line="+10"/>
+ <location line="+12"/>
 <source>_Accept non-standard audio frequency for DVD</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Create _OpenDML files</source>
- <translation type="unfinished">
+ <translation type="obsolete">
 </translation>
 </message>
 <message>
@@ -4857,17 +4909,22 @@
 </translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+5"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+1"/>
 <source>_Default to the directory of the last read file for saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+5"/>
 <source>XVideo (best)</source>
 <translation type="unfinished">
@@ -4913,7 +4970,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+211"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -5000,10 +5057,10 @@
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
 <location line="+3"/>
 <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
+ <location filename="../../common/gui_save.cpp" line="+289"/>
 <location line="+21"/>
 <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
 <source>Audio</source>
 <translation type="unfinished">Ses</translation>
 </message>
@@ -5017,7 +5074,7 @@
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
 <source>CPU</source>
 <translation type="unfinished">
 </translation>
@@ -5034,7 +5091,7 @@
 <translation type="unfinished">Tercihler</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+42"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -5048,7 +5105,7 @@
 </message>
 <message>
 <location line="+23"/>
- <location line="+8"/>
+ <location line="+9"/>
 <source>Filters</source>
 <translation type="unfinished">Süzgeçler</translation>
 </message>
@@ -5239,7 +5296,7 @@
 <translation type="unfinished">Kodek Hatası</translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
+ <location filename="../../common/gui_main.cpp" line="+357"/>
 <source>Not coded in this version</source>
 <translation type="unfinished">Bu sürümde kodlanmamış</translation>
 </message>
@@ -5254,13 +5311,42 @@
 </translation>
 </message>
 <message>
- <location line="+241"/>
+ <location line="+251"/>
 <source>Are you sure?</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+119"/>
+ <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>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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"/>
 <source>Permission error</source>
 <translation type="unfinished">İzin hatası</translation>
 </message>
@@ -5357,7 +5443,7 @@
 </message>
 <message>
 <location line="+8"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
 <source>Something bad happened</source>
 <translation type="unfinished">Kötü birşeyler oldu</translation>
 </message>
@@ -5374,7 +5460,7 @@
 </translation>
 </message>
 <message>
- <location line="+258"/>
+ <location line="+261"/>
 <source>AvsProxy</source>
 <translation type="unfinished">
 </translation>
@@ -5427,7 +5513,7 @@
 <translation type="unfinished">_Halka Azaltma</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
+ <location filename="../../common/gui_save.cpp" line="-228"/>
 <source>Select Workbench to Save</source>
 <translation type="unfinished">
 </translation>
@@ -5457,7 +5543,7 @@
 </translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+15"/>
 <source>Select File to Save</source>
 <translation type="unfinished">
 </translation>
@@ -5468,39 +5554,36 @@
 <translation type="unfinished">Ses kaydediliyor</translation>
 </message>
 <message>
- <location line="+179"/>
 <source>Saving as set of jpegs</source>
- <translation type="unfinished">Jpeg seti olarak kaydediliyor</translation>
+ <translation type="obsolete">Jpeg seti olarak kaydediliyor</translation>
 </message>
 <message>
- <location line="+6"/>
 <source>Cannot decode frame</source>
- <translation type="unfinished">Kare kodu çözülemedi</translation>
+ <translation type="obsolete">Kare kodu çözülemedi</translation>
 </message>
 <message>
- <location line="+0"/>
 <source>Aborting.</source>
- <translation type="unfinished">İptâl ediliyor.</translation>
+ <translation type="obsolete">İptâl ediliyor.</translation>
 </message>
 <message>
- <location line="+11"/>
- <location line="+38"/>
+ <location line="+308"/>
+ <location line="+83"/>
 <source>Done</source>
 <translation type="unfinished">Tamamlandı</translation>
 </message>
 <message>
- <location line="-38"/>
+ <location line="-83"/>
 <source>Saved %d images.</source>
 <translation type="unfinished">%d resim kaydedildi.</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+ <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="-244"/>
+ <location filename="../../common/gui_main.cpp" line="-247"/>
 <location line="+27"/>
 <location line="+24"/>
 <location line="+8"/>
@@ -5511,12 +5594,11 @@
 <translation type="unfinished">Hata</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="+0"/>
 <source>Could not save all images.</source>
- <translation type="unfinished">Tüm resimler kaydedilemedi.</translation>
+ <translation type="obsolete">Tüm resimler kaydedilemedi.</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location filename="../../common/gui_save.cpp" line="+61"/>
 <source>BMP op failed</source>
 <translation type="unfinished">BMP işlemmi başarısız oldu</translation>
 </message>
@@ -5526,7 +5608,7 @@
 <translation type="unfinished">%s BMP kaydetme başarısız oldu.</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+20"/>
 <source>File %s has been successfully saved.</source>
 <translation type="unfinished">%s dosyası başarıyla kaydedildi.</translation>
 </message>
@@ -5722,7 +5804,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
 <source>TimeStamp:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5812,7 +5894,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-291"/>
 <source>Decode video using VDPAU (NVIDIA)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5827,27 +5909,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable openGl support</source>
+ <location line="+2"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>If you use Hw decoding, it is better to use the matching display driver</source>
+ <location line="+2"/>
+ <source>Enable openGl support</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+8"/>
- <source>_Check for new release</source>
+ <location line="+2"/>
+ <source>If you use Hw decoding, it is better to use the matching display driver</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+55"/>
- <source>_Split MPEG files every (MB):</source>
+ <location line="+7"/>
+ <source>_Check for new release</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+65"/>
 <source>VDPAU (best)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5903,12 +5985,13 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
 <location line="+3"/>
 <source>HW Accel</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+12"/>
 <source>_Always ask which port to use</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5918,7 +6001,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
 <source>Open</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5951,11 +6034,21 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Save as JPEG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <source>Close</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6052,7 +6145,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+2"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
 <source>Select Track</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6172,8 +6270,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
 <source>You cannot remove *all* the video
 </source>
 <translation type="unfinished"></translation>
@@ -6250,7 +6348,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
+ <location filename="../../common/gui_main.cpp" line="-1313"/>
 <source>Select script/project to run</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6275,7 +6373,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+108"/>
+ <location line="+112"/>
 <location line="+68"/>
 <source>Select Video File...</source>
 <translation type="unfinished"></translation>
@@ -6296,7 +6394,15 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+206"/>
+ <location line="+114"/>
+ <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="+21"/>
 <source>Cutting</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6306,7 +6412,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+663"/>
+ <location line="+704"/>
 <location line="+7"/>
 <source>Invalid audio index given</source>
 <translation type="unfinished"></translation>
@@ -6337,7 +6443,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+290"/>
+ <location line="+293"/>
 <source>Oops</source>
 <translation type="unfinished">Ah</translation>
 </message>
@@ -6347,12 +6453,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
 <source>Trouble initializing audio device</source>
 <translation type="unfinished">Ses aygıtının başlatılmasında hata</translation>
 </message>
 <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
+ <location filename="../../common/gui_save.cpp" line="-554"/>
 <source>No</source>
 <translation type="unfinished">
 </translation>
@@ -6388,7 +6494,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+209"/>
+ <location line="+45"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+170"/>
 <source>Function not implemented
 </source>
 <translation type="unfinished"></translation>
@@ -6404,17 +6515,47 @@
 <translation type="unfinished">Kaydetme başarısız</translation>
 </message>
 <message>
- <location line="+21"/>
+ <location line="+84"/>
 <source>Jpeg</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+0"/>
- <source>Fail to save as jpeg</source>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+104"/>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+67"/>
 <source>Cannot get tinyPÿ script engine</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6837,28 +6978,28 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
 <source>Building time map</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
 <source>Memory error</source>
 <translation type="unfinished">Hafıza hatası</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+464"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+142"/>
- <source>Too short</source>
+ <location line="+165"/>
+ <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 line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
+ <location line="+6"/>
+ <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -6959,7 +7100,7 @@
 <translation type="unfinished">1:1</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
 <location line="+32"/>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
 <location line="+35"/>
@@ -6987,6 +7128,50 @@
 <source>Cannot compile shader</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>admIvtc</name>
@@ -7369,16 +7554,16 @@
 </message>
 <message>
 <location line="+12"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+3"/>
 <source>Replace by Black</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7488,7 +7673,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+31"/>
+ <location line="+32"/>
 <source>Change FPS</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7498,7 +7683,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+130"/>
+ <location line="+141"/>
 <source>Source Fps:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7692,7 +7877,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="+89"/>
+ <location line="+90"/>
 <source>Contrast</source>
 <translation type="unfinished">Fark</translation>
 </message>
@@ -7702,8 +7887,8 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
 <source>Brightness</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7816,7 +8001,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+23"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
 <translation type="unfinished"></translation>
@@ -7827,51 +8012,66 @@
 </source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>cropDialog</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished">Sıfırla</translation>
 </message>
 <message>
 <location line="-88"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-38"/>
 <source>Crop</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+75"/>
 <source>Right:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Top:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+64"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
 <source>Bottom:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
 <source>Left:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
 <source>Auto Crop</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>dcaenc</name>
@@ -8099,52 +8299,107 @@
 </message>
 <message>
 <location line="+44"/>
- <location line="+189"/>
- <location line="+24"/>
+ <location line="+180"/>
+ <location line="+21"/>
 <source>None</source>
 <translation type="unfinished">Hiçbiri</translation>
 </message>
 <message>
- <location line="-230"/>
- <location line="+223"/>
+ <location line="-218"/>
+ <location line="+211"/>
 <source>Unknown</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
+ <location line="-7"/>
+ <source>Audio Codec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Container:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Audio Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Total Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Video Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Average Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+31"/>
+ <location line="+48"/>
 <source>0</source>
 <translation type="unfinished">0</translation>
 </message>
 <message>
- <location line="-7"/>
+ <location line="-69"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Quantiser:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Elapsed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>00:00:00</source>
 <translation type="unfinished">00:00:00</translation>
 </message>
 <message>
- <location line="-152"/>
+ <location line="+14"/>
+ <source>Frames/sec:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-151"/>
 <location line="+7"/>
- <location line="+17"/>
+ <location line="+14"/>
 <source>0 MB</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+77"/>
+ <location line="+68"/>
 <source>0 kB/s</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="-357"/>
+ <location line="-327"/>
 <source>Shut down computer when finished</source>
 <translation type="unfinished">
 </translation>
 </message>
 <message>
- <location line="+20"/>
+ <location line="-11"/>
+ <source>Time Remaining:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
 <source>Priority:</source>
 <translation type="unfinished">
 </translation>
@@ -8189,113 +8444,25 @@
 <translation type="unfinished">Gelişmiş</translation>
 </message>
 <message>
- <location line="-171"/>
+ <location line="-162"/>
 <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+35"/>
 <source>Phase:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
+ <location line="+94"/>
 <source>Minimize to Tray</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+86"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
+ <location line="+114"/>
 <source>Video Codec:</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+34"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>encodingWindow</name>
@@ -8340,7 +8507,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
 <source>Reset</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8415,6 +8582,11 @@
 <source>Faac Configuration</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>fade</name>
@@ -8443,41 +8615,41 @@
 <name>fadeTo</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
+ <location line="+23"/>
 <source>Fade</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-23"/>
+ <location line="-22"/>
 <source>Fade.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
+ <location line="+18"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>fadeToBlack</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+56"/>
+ <location line="+24"/>
 <source>Fade to black</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-25"/>
+ <location line="-23"/>
 <source>Fade to black in/out.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+10"/>
 <source>Out</source>
 <translation type="unfinished">Dışarı</translation>
 </message>
@@ -8497,18 +8669,18 @@
 <translation type="unfinished">İçeri doğru solma</translation>
 </message>
 <message>
- <location line="+9"/>
+ <location line="+8"/>
 <source>_Fade type:</source>
 <translation type="unfinished">So_lma tipi:</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Start time (ms):</source>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -9028,8 +9200,8 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+218"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+193"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
@@ -9070,6 +9242,21 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
@@ -9078,6 +9265,11 @@
 </message>
 <message>
 <location line="+1"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
@@ -9091,7 +9283,27 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
 <source>NVENC H.264 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9231,6 +9443,64 @@
 </message>
 </context>
 <context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>filesel</name>
 <message>
 <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
@@ -10025,7 +10295,7 @@
 </message>
 <message>
 <location line="+3"/>
- <source>use QT4 version</source>
+ <source>use Qt version</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -10495,6 +10765,11 @@
 <source>Select Logo Image</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>logoDialog</name>
@@ -10525,18 +10800,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <location line="+40"/>
+ <source>Fade-in/out</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alpha</source>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
+ <location line="-85"/>
+ <source>Alpha</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -10752,12 +11027,12 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+29"/>
 <source>Force display width</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10767,7 +11042,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
 <source>MKV Muxer</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10846,7 +11126,7 @@
 <context>
 <name>mp4demuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
 <source>Problem reading SVQ3 headers</source>
 <translation type="unfinished">SVQ3 başlıklarının okunmasında hata</translation>
 </message>
@@ -10858,7 +11138,7 @@
 <context>
 <name>mp4muxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+66"/>
 <location line="+9"/>
 <source>Unsupported</source>
 <translation type="unfinished">Desteklenmiyor</translation>
@@ -10874,7 +11154,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+81"/>
+ <location line="+112"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10884,7 +11164,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
 <source>Muxing Format</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10894,6 +11174,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+1"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location line="+3"/>
 <source>MP4 Muxer</source>
 <translation type="unfinished"></translation>
@@ -11092,12 +11382,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+192"/>
+ <location line="+188"/>
 <source>Seek</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+65"/>
+ <location line="+78"/>
 <source>Error</source>
 <translation type="unfinished">Hata</translation>
 </message>
@@ -11195,7 +11485,7 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
 <location line="+76"/>
- <location line="+263"/>
+ <location line="+268"/>
 <source>Malformed header</source>
 <translation type="unfinished">Bozuk başlık</translation>
 </message>
@@ -11209,13 +11499,13 @@
 <context>
 <name>partial</name>
 <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+343"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>End time (ms):</source>
+ <source>_End time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
@@ -11407,7 +11697,7 @@
 <context>
 <name>psdemuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
 <source>Error</source>
 <translation type="unfinished">Hata</translation>
 </message>
@@ -11437,18 +11727,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+140"/>
+ <location line="+22"/>
+ <location line="+152"/>
 <source>Error</source>
 <translation type="unfinished">Hata</translation>
 </message>
 <message>
- <location line="-140"/>
+ <location line="-152"/>
 <source>Cannot use that file as audio track</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+140"/>
+ <location line="+152"/>
 <source>Some tracks are used multiple times</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11473,7 +11763,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+33"/>
+ <location line="+34"/>
 <source>copy</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11495,7 +11785,7 @@
 </translation>
 </message>
 <message>
- <location line="+101"/>
+ <location line="+100"/>
 <source>First Pass</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11553,7 +11843,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
+ <location line="+245"/>
 <source>Recent Files</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11563,7 +11853,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+627"/>
+ <location line="+646"/>
 <source>Play/Stop</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11628,7 +11918,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+605"/>
+ <location line="+617"/>
 <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>
@@ -11639,7 +11929,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+315"/>
+ <location line="+334"/>
 <source> (%d track(s))</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11787,7 +12077,7 @@
 <context>
 <name>qmainfilter</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+436"/>
 <source>Partial</source>
 <translation type="unfinished">Parçalı</translation>
 </message>
@@ -11827,7 +12117,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+224"/>
+ <location line="+225"/>
 <source>Load video filters..</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11864,7 +12154,7 @@
 <context>
 <name>qprops</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
 <source>No</source>
 <translation type="unfinished">
 </translation>
@@ -11886,7 +12176,7 @@
 <translation type="unfinished">İki kanal</translation>
 </message>
 <message>
- <location line="+46"/>
+ <location line="+62"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11962,18 +12252,18 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-132"/>
+ <location line="-148"/>
 <source>%2.3f fps</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
- <location line="+59"/>
+ <location line="+74"/>
 <source>%02d:%02d:%02d.%03d</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-65"/>
+ <location line="-80"/>
 <source>%s (%u:%u)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12093,7 +12383,7 @@
 <context>
 <name>resampleFps</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+361"/>
 <source>_Mode:</source>
 <translation type="unfinished">_Kip:</translation>
 </message>
@@ -12103,7 +12393,7 @@
 <translation type="unfinished">_Yeni kare hızı:</translation>
 </message>
 <message>
- <location line="-316"/>
+ <location line="-319"/>
 <source>Custom</source>
 <translation type="unfinished">Özel</translation>
 </message>
@@ -12143,7 +12433,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+281"/>
+ <location line="+284"/>
 <source>Resample fps</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12151,7 +12441,7 @@
 <context>
 <name>resize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
 <source>Width and height cannot be odd</source>
 <translation type="unfinished">Genişlik ve yükseklik tekil olamaz</translation>
 </message>
@@ -12184,8 +12474,6 @@
 <translation type="unfinished">Tekrar boyutlandır</translation>
 </message>
 <message>
- <location line="+50"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
@@ -12212,8 +12500,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -12238,8 +12524,6 @@
 <message>
 <location line="-37"/>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
 <location line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
@@ -12262,7 +12546,7 @@
 <translation type="unfinished">16:9</translation>
 </message>
 <message>
- <location line="+172"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+251"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+172"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+172"/>
@@ -12322,7 +12606,7 @@
 <translation type="unfinished">Çiftkübik</translation>
 </message>
 <message>
- <location line="-423"/>
+ <location line="-400"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-423"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-423"/>
@@ -12352,7 +12636,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
@@ -12368,7 +12651,6 @@
 </message>
 <message>
 <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+42"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+42"/>
@@ -12382,7 +12664,23 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+44"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+15"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
@@ -12704,6 +13002,30 @@
 </message>
 </context>
 <context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>subAss</name>
 <message>
 <source>_Subtitle file (ASS/SSA):</source>
@@ -12914,6 +13236,24 @@
 </message>
 </context>
 <context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>tsdemuxer</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
@@ -12927,16 +13267,16 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+186"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+323"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+83"/>
 <source>There are several files with sequential file names. Should they be all loaded ?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+ <location line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+10"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+8"/>
 <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
 <source>Indexing</source>
 <translation type="unfinished">
@@ -12960,7 +13300,7 @@
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13009,6 +13349,27 @@
 </message>
 </context>
 <context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>vaapiResize</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
@@ -13042,24 +13403,6 @@
 </message>
 </context>
 <context>
- <name>vaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
 <name>vdpaudeint</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
@@ -13404,7 +13747,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
 <source>none</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13450,7 +13793,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+68"/>
+ <location line="+74"/>
 <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -13464,7 +13807,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+41"/>
+ <location line="+61"/>
 <location line="+69"/>
 <location line="+14"/>
 <source>Error</source>
@@ -13691,7 +14034,12 @@
 <translation type="unfinished">31</translation>
 </message>
 <message>
- <location line="+1916"/>
+ <location line="+171"/>
+ <source>11 (Best)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1745"/>
 <source>Normal</source>
 <translation type="unfinished">Normal</translation>
 </message>
@@ -13932,12 +14280,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+20"/>
- <source>10 (Best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+78"/>
+ <location line="+98"/>
 <source>Motion Vector</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14759,7 +15102,7 @@
 <translation type="unfinished">Özel</translation>
 </message>
 <message>
- <location line="+357"/>
+ <location line="+361"/>
 <source>Target Bitrate:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14886,12 +15229,12 @@
 </message>
 <message>
 <location line="+7"/>
- <location line="+2731"/>
+ <location line="+2738"/>
 <source>Delete</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2689"/>
+ <location line="-2696"/>
 <source>General</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15072,12 +15415,12 @@
 <message>
 <location line="-190"/>
 <location line="+213"/>
- <location line="+1267"/>
+ <location line="+1274"/>
 <source>Quantiser</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-1457"/>
+ <location line="-1464"/>
 <location line="+213"/>
 <source>51 (Low Quality)</source>
 <translation type="unfinished"></translation>
@@ -15114,12 +15457,12 @@
 </message>
 <message>
 <location line="+14"/>
- <location line="+2070"/>
+ <location line="+2077"/>
 <source>frames</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="-2046"/>
+ <location line="-2053"/>
 <source>Sequence Parameter Set Identifer:</source>
 <translation type="unfinished"></translation>
 </message>
@@ -15417,7 +15760,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="+34"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
 <source>Quantisation Matrix</source>
 <translation type="unfinished"></translation>
 </message>

avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_zh_CN.ts Added

@@ -0,0 +1,12100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+ <name>ADM_Composer</name>
+ <message>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+ <source>Checking if timestamps are valid..</source>
+ <translation>检查时间戳是否有效。</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <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>
+ <message>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+ <source>Attempt to open %s failed!</source>
+ <translation>尝试开启 %s 失败!</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
+1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
+2.) concatenate them together</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+115"/>
+ <source>Some timing information are incorrect.
+It happens with some capture software.
+If you re encode video we should drop these informations,
+ else it will cause dropped frame/jerky video.
+If you just copy the video without reencoding,
+ you should keep them.
+Drop timing informations ?</source>
+ <translation>一些计时信息不正确。
+ 它会发生某些捕获软件。
+ 如果你对视频进行编码我们应该放下这些信息，
+ 否则它将导致出现掉落帧/生涩视频。
+ 如果你只是复制视频没有重新编码，
+ 你应该保持它们的定时信息？
+</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-71"/>
+ <source>Cannot find a demuxer for %s</source>
+ <translation>找不到为分离器 %s</translation>
+ </message>
+</context>
+<context>
+ <name>CalculatorDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+398"/>
+ <location line="+27"/>
+ <location line="+34"/>
+ <location line="+68"/>
+ <location line="+18"/>
+ <source>0</source>
+ <translation>0</translation>
+ </message>
+ <message>
+ <location line="-335"/>
+ <location line="+198"/>
+ <location line="+27"/>
+ <location line="+34"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+163"/>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <location line="-568"/>
+ <source>AVI</source>
+ <translation>AVI</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>OGM</source>
+ <translation>OGM</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
+ </message>
+ <message>
+ <location line="+212"/>
+ <location line="+37"/>
+ <location line="+232"/>
+ <source>kbps</source>
+ <translation>kbps</translation>
+ </message>
+ <message>
+ <location line="-431"/>
+ <source>DVD-5</source>
+ <translation>DVD-5</translation>
+ </message>
+ <message>
+ <location line="+259"/>
+ <source>Video Size:</source>
+ <translation>视频大小:</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Audio Size:</source>
+ <translation>音频大小:</translation>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Audio Bitrate</source>
+ <translation>音频比特率</translation>
+ </message>
+ <message>
+ <location line="-170"/>
+ <source>Medium:</source>
+ <translation>媒体:</translation>
+ </message>
+ <message>
+ <location line="-26"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
+ </message>
+ <message>
+ <location line="+583"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <location line="-510"/>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <location line="+219"/>
+ <source>Result</source>
+ <translation>结果</translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <source>Target</source>
+ <translation>目标</translation>
+ </message>
+ <message>
+ <location line="+86"/>
+ <source>1 x 74 minute CD</source>
+ <translation>1 x 74 分钟 CD</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>2 x 74 minute CD</source>
+ <translation>2 x 74 分钟 CD</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>1 x 80 minute CD</source>
+ <translation>1 x 80 分钟 CD</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>2 x 80 minute CD</source>
+ <translation>2 x 80 分钟 CD</translation>
+ </message>
+ <message>
+ <location line="+200"/>
+ <source>Track 2:</source>
+ <translation>轨道 2:</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Track 1:</source>
+ <translation>轨道 1:</translation>
+ </message>
+ <message>
+ <location line="-176"/>
+ <source>Duration:</source>
+ <translation>持续时间:</translation>
+ </message>
+ <message>
+ <location line="-80"/>
+ <source>Calculator</source>
+ <translation>计算器</translation>
+ </message>
+ <message>
+ <location line="+171"/>
+ <source>Custom Size:</source>
+ <translation>自定义大小:</translation>
+ </message>
+ <message>
+ <location line="-98"/>
+ <source>Format:</source>
+ <translation>格式:</translation>
+ </message>
+ <message>
+ <location line="+355"/>
+ <source>Total Size:</source>
+ <translation>总大小:</translation>
+ </message>
+ <message>
+ <location line="+120"/>
+ <source>Bits Per Pixel:</source>
+ <translation>每像素比特数:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Video Bitrate:</source>
+ <translation>视频比特率:</translation>
+ </message>
+</context>
+<context>
+ <name>Dialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+66"/>
+ <source># Images :</source>
+ <translation># 图像 :</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Indexing</source>
+ <translation>正在索引</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Time Left : Infinity</source>
+ <translation>剩下时间： 无限</translation>
+ </message>
+</context>
+<context>
+ <name>DialogAudioTracks</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="+48"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <source>Configure</source>
+ <translation>配置</translation>
+ </message>
+ <message>
+ <location line="-157"/>
+ <source>Audio Tracks Configuration</source>
+ <translation>音频轨配置</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Track 1</source>
+ <translation>轨道 1</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Track 2</source>
+ <translation>轨道 2:</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Track 3</source>
+ <translation>轨道 3:</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Track 4</source>
+ <translation>轨道 4:</translation>
+ </message>
+ <message>
+ <location line="-116"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <source>Enabled</source>
+ <translation>启用</translation>
+ </message>
+ <message>
+ <location line="-100"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <source>Filters</source>
+ <translation>过滤器</translation>
+ </message>
+</context>
+<context>
+ <name>DialogOcr</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+74"/>
+ <source>Ok</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>0/0</source>
+ <translation>0/0</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <location line="-52"/>
+ <source>Skip All</source>
+ <translation>略过全部</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Skip Glyph</source>
+ <translation>略过字形</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Calibrate</source>
+ <translation>校准</translation>
+ </message>
+ <message>
+ <location line="+90"/>
+ <source>Nb Lines :</source>
+ <translation>线的数目 :</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Timecode:</source>
+ <translation>时间码:</translation>
+ </message>
+ <message>
+ <location line="-96"/>
+ <source>Dialog</source>
+ <translation>对话窗</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Ignore</source>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>00:00:00/000</source>
+ <translation>00:00:00/000</translation>
+ </message>
+</context>
+<context>
+ <name>DialogProcessing</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+81"/>
+ <source>0</source>
+ <translation>0</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>0 fps</source>
+ <translation>0 fps</translation>
+ </message>
+ <message>
+ <location line="-55"/>
+ <source>TimeLeft</source>
+ <translation>剩余时间</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Speed</source>
+ <translation>速率</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <source>ProcessImages</source>
+ <translation>程序图像</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>Dialog</source>
+ <translation>对话窗</translation>
+ </message>
+</context>
+<context>
+ <name>DialogProgress</name>
+ <message>
+ <location filename="../ADM_jobs/src/uiProgress.ui" line="+51"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>1/1</source>
+ <translation>1/1</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>File being written </source>
+ <translation>文件正被写入</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Progress</source>
+ <translation>程序</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Current job</source>
+ <translation>目前工作</translation>
+ </message>
+</context>
+<context>
+ <name>FDK-AAC</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+434"/>
+ <location line="+9"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率：</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <location line="+7"/>
+ <source>After burner</source>
+ <translation>后燃器</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <location line="+5"/>
+ <source>FDK-AAC Configuration</source>
+ <translation>FDK-AAC 配置</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>_Profile::</source>
+ <translation>_设置檔:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>SBR enabled</source>
+ <translation>SBR 启用</translation>
+ </message>
+</context>
+<context>
+ <name>MainWindow</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1399"/>
+ <source>?</source>
+ <translation>?</translation>
+ </message>
+ <message>
+ <location line="+111"/>
+ <source>A:</source>
+ <translation>A:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>B:</source>
+ <translation>B:</translation>
+ </message>
+ <message>
+ <location line="+272"/>
+ <source>F7</source>
+ <translation>F7</translation>
+ </message>
+ <message>
+ <location line="-1043"/>
+ <source>ms</source>
+ <translation>ms</translation>
+ </message>
+ <message>
+ <location line="-585"/>
+ <source>&amp;Go</source>
+ <translation>&amp;前往</translation>
+ </message>
+ <message>
+ <location line="+818"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+341"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location line="+308"/>
+ <source>&amp;Top</source>
+ <translation>&amp;上下并排</translation>
+ </message>
+ <message>
+ <location line="-1425"/>
+ <location line="+169"/>
+ <source>Copy</source>
+ <translatorcomment>NO Display</translatorcomment>
+ <translation type="unfinished">复制</translation>
+ </message>
+ <message>
+ <location line="+319"/>
+ <source>Play</source>
+ <translation>播放</translation>
+ </message>
+ <message>
+ <location line="-638"/>
+ <location line="+7"/>
+ <source>XXXX</source>
+ <translation>XXXX</translation>
+ </message>
+ <message>
+ <location line="-191"/>
+ <source>&amp;Auto</source>
+ <translation>&amp;自动</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>&amp;Edit</source>
+ <translation>&amp;编辑</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>&amp;File</source>
+ <translation>&amp;文件</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>&amp;Help</source>
+ <translation>&amp;说明</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>&amp;View</source>
+ <translation>&amp;检视</translation>
+ </message>
+ <message>
+ <location line="+1573"/>
+ <source>Open Video</source>
+ <translation>开启视频</translation>
+ </message>
+ <message>
+ <location line="+214"/>
+ <source>Si&amp;de</source>
+ <translation>左右&amp;并排</translation>
+ </message>
+ <message>
+ <location line="-606"/>
+ <source>Time:</source>
+ <translation>时间:</translation>
+ </message>
+ <message>
+ <location line="+404"/>
+ <source>Alt+Return</source>
+ <translation>Alt+Return</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <location line="+3"/>
+ <source>Load/Run Project</source>
+ <translation>加载/执行项目</translation>
+ </message>
+ <message>
+ <location line="-599"/>
+ <source>Search next black frame</source>
+ <translation>搜寻下一帧黑框</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Go to first frame [HOME]</source>
+ <translation>转到第一帧 [HOME]</translation>
+ </message>
+ <message>
+ <location line="-118"/>
+ <source>Go to next keyframe [UP]</source>
+ <translation>转到下一帧(关键帧或I帧) [UP]</translation>
+ </message>
+ <message>
+ <location line="+718"/>
+ <source>&amp;Calculator...</source>
+ <translation>&amp;计算器...</translation>
+ </message>
+ <message>
+ <location line="-262"/>
+ <source>Go to marker A [PAGE UP]</source>
+ <translation>转到标记 A [PAGE UP]</translation>
+ </message>
+ <message>
+ <location line="+250"/>
+ <location line="+3"/>
+ <source>Save Project</source>
+ <translation>保存项目</translation>
+ </message>
+ <message>
+ <source>Display output video on playback</source>
+ <translation type="vanished">显示输出视频播放</translation>
+ </message>
+ <message>
+ <location line="-1606"/>
+ <source>&amp;Audio</source>
+ <translation>&amp;音频</translation>
+ </message>
+ <message>
+ <location line="+1633"/>
+ <source>&amp;Input</source>
+ <translation>&amp;输入</translation>
+ </message>
+ <message>
+ <location line="+51"/>
+ <source>&amp;Selection</source>
+ <translatorcomment>NO Display</translatorcomment>
+ <translation type="unfinished">&amp;标志区间段</translation>
+ </message>
+ <message>
+ <location line="-1689"/>
+ <source>&amp;Tools</source>
+ <translation>&amp;工具</translation>
+ </message>
+ <message>
+ <location line="+1271"/>
+ <source>Se&amp;lection</source>
+ <translation>标志&amp;区间段</translation>
+ </message>
+ <message>
+ <location line="-323"/>
+ <source>Set end marker [CTRL+PAGEDOWN]</source>
+ <translation>设置结束标记 [CTRL+PAGEDOWN]</translation>
+ </message>
+ <message>
+ <location line="+413"/>
+ <location line="+10"/>
+ <source>000000</source>
+ <translation>000000</translation>
+ </message>
+ <message>
+ <location line="+346"/>
+ <source>&amp;Audio Metre</source>
+ <translation>&amp;音频画面</translation>
+ </message>
+ <message>
+ <location line="-1523"/>
+ <location line="+142"/>
+ <location line="+169"/>
+ <location line="+181"/>
+ <source>Configure</source>
+ <translation>配置</translation>
+ </message>
+ <message>
+ <location line="-283"/>
+ <source> (0 track(s))</source>
+ <translation> (0 轨k(s))</translation>
+ </message>
+ <message>
+ <location line="-444"/>
+ <source>Vi&amp;deo</source>
+ <translation>影&amp;片</translation>
+ </message>
+ <message>
+ <location line="+845"/>
+ <source>Play [SPACE]</source>
+ <translation>播放 [SPACE]</translation>
+ </message>
+ <message>
+ <location line="+694"/>
+ <source>Audio &amp;Metre</source>
+ <translation>音频 &amp;画面</translation>
+ </message>
+ <message>
+ <location line="-1525"/>
+ <source>&amp;Toolbars</source>
+ <translation>&amp;工具栏</translation>
+ </message>
+ <message>
+ <location line="+1566"/>
+ <source>&amp;Open...</source>
+ <translation>&amp;开启文件...</translation>
+ </message>
+ <message>
+ <location line="-319"/>
+ <source>Frame type:</source>
+ <translation>帧类型:</translation>
+ </message>
+ <message>
+ <location line="+346"/>
+ <location line="+3"/>
+ <source>Save Video</source>
+ <translation>保存视频</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Save &amp;Video...</source>
+ <translation>保存&amp;视频...</translation>
+ </message>
+ <message>
+ <location line="-589"/>
+ <source>Search previous black frame</source>
+ <translation>搜寻上一帧黑框</translation>
+ </message>
+ <message>
+ <location line="-141"/>
+ <source>Go to previous frame [LEFT]</source>
+ <translation>转到上一帧 [LEFT]</translation>
+ </message>
+ <message>
+ <location line="-772"/>
+ <source>Codec O&amp;ptions</source>
+ <translation>编译码器&amp;选项</translation>
+ </message>
+ <message>
+ <location line="+1520"/>
+ <source>Play filtered</source>
+ <translation>过滤播放</translation>
+ </message>
+ <message>
+ <location line="-213"/>
+ <source>Go to Marker B [PAGE DOWN]</source>
+ <translation>转到标记 B [PAGE DOWN]</translation>
+ </message>
+ <message>
+ <location line="-975"/>
+ <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
+ <translation>&lt;b&gt;输出音频编码佳AC3/Mp3&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+222"/>
+ <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
+ <translation>&lt;b&gt;视频输出格式(容器)佳Mp4/Mkv&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+975"/>
+ <source>&amp;Load/Run Project...</source>
+ <translation>&amp;加载/执行项目...</translation>
+ </message>
+ <message>
+ <location line="-547"/>
+ <source>Go to last frame [END]</source>
+ <translation>G转到最后一帧 [END]</translation>
+ </message>
+ <message>
+ <location line="-1053"/>
+ <source>&amp;Custom</source>
+ <translation>&amp;自定义</translation>
+ </message>
+ <message>
+ <location line="+1660"/>
+ <source>&amp;Output</source>
+ <translation>&amp;输出</translation>
+ </message>
+ <message>
+ <location line="-1635"/>
+ <source>&amp;Recent</source>
+ <translation>&amp;最近</translation>
+ </message>
+ <message>
+ <location line="+1077"/>
+ <source>Forward one minute</source>
+ <translation>前进一分钟 </translation>
+ </message>
+ <message>
+ <location line="-544"/>
+ <source>&amp;Shift:</source>
+ <translation>&amp;位移(±):</translation>
+ </message>
+ <message>
+ <location line="+1155"/>
+ <source>&amp;Volume</source>
+ <translation>&amp;音量</translation>
+ </message>
+ <message>
+ <location line="-42"/>
+ <source>&amp;Codec Options</source>
+ <translation>&amp;编译码器选项</translation>
+ </message>
+ <message>
+ <location line="-572"/>
+ <source>Forward one minute [CTRL+UP]</source>
+ <translation>前进一分钟 [CTRL+UP]</translation>
+ </message>
+ <message>
+ <location line="+643"/>
+ <source>&amp;Separate</source>
+ <translation>&amp;分离窗口</translation>
+ </message>
+ <message>
+ <location line="-807"/>
+ <source>Set start marker [CTRL+PAGEUP]</source>
+ <translation>设置开始标记 [CTRL+PAGEUP]</translation>
+ </message>
+ <message>
+ <location line="-1076"/>
+ <source>Avidemux</source>
+ <translation>Avidemux</translation>
+ </message>
+ <message>
+ <location line="+503"/>
+ <location line="+169"/>
+ <source>Filters</source>
+ <translation>过滤器-特效</translation>
+ </message>
+ <message>
+ <location line="+888"/>
+ <source>Vol&amp;ume</source>
+ <translation>音&amp;量</translation>
+ </message>
+ <message>
+ <location line="-1315"/>
+ <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+ <translation>&lt;b&gt;解码器.颜色.不编码直选COPY&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+139"/>
+ <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
+ <translation>&lt;b&gt;输出视频编码佳x264/x265&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+936"/>
+ <source>00:00:00.000</source>
+ <translation>00:00:00.000</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>/ 00:00:00.000</source>
+ <translation>/ 00:00:00.000</translation>
+ </message>
+ <message>
+ <location line="+193"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+221"/>
+ <source>Save &amp;Project</source>
+ <translation>保存&amp;项目</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>&amp;Information...</source>
+ <translation>&amp;属性...</translation>
+ </message>
+ <message>
+ <location line="-695"/>
+ <source>Go to next frame [RIGHT]</source>
+ <translation>转到下一帧</translation>
+ </message>
+ <message>
+ <location line="+210"/>
+ <source>Backward one minute [CTRL+DOWN]</source>
+ <translation>倒退一分钟 [CTRL+DOWN]</translation>
+ </message>
+ <message>
+ <source>&lt;b&gt;Video&lt;/b&gt;</source>
+ <translation type="vanished">&lt;b&gt;视频&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+598"/>
+ <source>Ctrl+Alt+C</source>
+ <translation>Ctrl+Alt+C</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Ctrl+Alt+M</source>
+ <translation>Ctrl+Alt+M</translation>
+ </message>
+ <message>
+ <location line="-42"/>
+ <source>Ctrl+Alt+N</source>
+ <translation>Ctrl+Alt+N</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Ctrl+Alt+S</source>
+ <translation>Ctrl+Alt+S</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Ctrl+Alt+V</source>
+ <translation>Ctrl+Alt+V</translation>
+ </message>
+ <message>
+ <location line="-827"/>
+ <source>Go to previous keyframe [DOWN]</source>
+ <translation>转到上一帧(关键帧或I帧) [DOWN]</translation>
+ </message>
+ <message>
+ <location line="-150"/>
+ <location line="+946"/>
+ <source>&amp;Navigation</source>
+ <translation>&amp;视频导航栏</translation>
+ </message>
+</context>
+<context>
+ <name>Opus</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SpiderMonkeyShell</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+49"/>
+ <source>Clear</source>
+ <translation>清除</translation>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>Shell</source>
+ <translation>壳(Shell)</translation>
+ </message>
+ <message>
+ <location line="+75"/>
+ <source>Ctrl+Return</source>
+ <translation>Ctrl+Return</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Evaluate</source>
+ <translation>求值</translation>
+ </message>
+</context>
+<context>
+ <name>VapourSynthProxy</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui" line="+37"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Run!</source>
+ <translation>执行!</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>VapourSynth Proxy</source>
+ <translation>VapourSynth 代理</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Select VS file</source>
+ <translation>选择VS文件</translation>
+ </message>
+</context>
+<context>
+ <name>aboutDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+220"/>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <source>© 2001 - 2017 Mean</source>
+ <translation type="vanished">© 2001 - 2017 Mean</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>&amp;License</source>
+ <translation>&amp;授权</translation>
+ </message>
+ <message>
+ <location line="-186"/>
+ <source>About Avidemux</source>
+ <translation>关于 Avidemux</translation>
+ </message>
+ <message>
+ <location line="+112"/>
+ <source>Multi-platform Video Editor</source>
+ <translation>跨平台视频编辑工具
+
+ 简体中文翻译者:李新厂 制作
+ </translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>© 2001 - 2018 Mean</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>http://www.avidemux.org</source>
+ <translation>http://www.avidemux.org</translation>
+ </message>
+ <message>
+ <location line="-48"/>
+ <source>Avidemux </source>
+ <translation>Avidemux </translation>
+ </message>
+</context>
+<context>
+ <name>addBorder</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+184"/>
+ <source>_Right border:</source>
+ <translation>_右侧边界:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+43"/>
+ <source>Add black borders around the image.</source>
+ <translation>增加图片周围的黑色边框，图片大小会再加双边尺寸</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="-1"/>
+ <source>Add Borders</source>
+ <translation>1.3-加入外边框-框厚必偶数值</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Incorrect parameters</source>
+ <translation>不正确的参数</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>_Left border:</source>
+ <translation>_左侧边界:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>All parameters must be even and within range.</source>
+ <translation>所有参数必须是偶数且在范围内。</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>_Top border:</source>
+ <translation>_顶部边界:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bottom border:</source>
+ <translation>_底部边界:</translation>
+ </message>
+</context>
+<context>
+ <name>adm</name>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
+ <location line="+2"/>
+ <location line="+2"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+55"/>
+ <source>No</source>
+ <translation>否</translation>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+282"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+383"/>
+ <source>1:1</source>
+ <translation>1:1</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+54"/>
+ <source>5.1</source>
+ <translation>5.1</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+74"/>
+ <source>4MV</source>
+ <translation>4MV</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+223"/>
+ <source>AAC</source>
+ <translation>AAC</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>AC3</source>
+ <translation>AC3</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+493"/>
+ <source>CPU</source>
+ <translation>CPU</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+ <source>DRC</source>
+ <translation>DRC</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-7"/>
+ <source>DTS</source>
+ <translation>DTS</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+21"/>
+ <source>Cut</source>
+ <translation>剪切</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-10"/>
+ <source>GMC</source>
+ <translation>GMC</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-468"/>
+ <source>Job</source>
+ <translation>工作</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+2"/>
+ <source>MP2</source>
+ <translation>MP2</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>MP3</source>
+ <translation>MP3</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>MP4</source>
+ <translation>MP4</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
+ <source>Low</source>
+ <translation>低</translation>
+ </message>
+ <message>
+ <location line="+80"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-11"/>
+ <source>PCM</source>
+ <translation>PCM</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+8"/>
+ <source>Off</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-13"/>
+ <source>SDL</source>
+ <translation>SDL</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
+ <source>WMA</source>
+ <translation>WMA</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+4"/>
+ <source>x86</source>
+ <translation>x86</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+12"/>
+ <source>BVHQ</source>
+ <translation>BVHQ</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+1"/>
+ <source>Copy</source>
+ <translation>复制</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
+ <source>FLAC</source>
+ <translation>FLAC</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+27"/>
+ <source>H263</source>
+ <translation>H263</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+434"/>
+ <location line="+83"/>
+ <source>Done</source>
+ <translation>完成</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+7"/>
+ <source>Gain</source>
+ <translation>增益</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-84"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
+ <source>High</source>
+ <translation>高</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-3"/>
+ <source>LPCM</source>
+ <translation>LPCM</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-180"/>
+ <source>Jpeg</source>
+ <translation>Jpeg</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-7"/>
+ <source>Main</source>
+ <translation>主要</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+2"/>
+ <source>OPUS</source>
+ <translation type="unfinished">OPUS</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
+ <source>Mono</source>
+ <translation>单音</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+53"/>
+ <source>Mpeg</source>
+ <translation>Mpeg</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-10"/>
+ <location line="+25"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-50"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+6"/>
+ <source>QDM2</source>
+ <translation>QDM2</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+1764"/>
+ <source>Oops</source>
+ <translation>Oops</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-36"/>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-37"/>
+ <source>SIMD</source>
+ <translation>SIMD</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+33"/>
+ <source>Redo</source>
+ <translation>取消复原键入</translation>
+ </message>
+ <message>
+ <location line="-18"/>
+ <source>Quit</source>
+ <translation>离开</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>Save</source>
+ <translation>保存</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+3"/>
+ <source>ULAW</source>
+ <translation>ULAW</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+30"/>
+ <source>Undo</source>
+ <translation>复原</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+ <source>_Gain mode:</source>
+ <translation>_增益模式:</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="+48"/>
+ <source>No audio track</source>
+ <translation>没有音轨</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-18"/>
+ <source>Stereo+surround</source>
+ <translation>立体+环绕</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+259"/>
+ <source>Plugins Info</source>
+ <translation>插件信息</translation>
+ </message>
+ <message>
+ <location line="-93"/>
+ <source>Audio Device</source>
+ <translation>音频装置</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="+68"/>
+ <source>You don&apos;t have LAME!.
+It is needed to create FLV video.</source>
+ <translation>它没&apos;有LAME！，它需要去建立 FLV视频。</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+184"/>
+ <source>File %s was NOT saved correctly.</source>
+ <translation>文件 %s 保存不正确。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+51"/>
+ <source>About</source>
+ <translation>关于</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-7"/>
+ <source>E-AC3</source>
+ <translation>E-AC3</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+212"/>
+ <location line="+3"/>
+ <location line="+5"/>
+ <location filename="../../common/gui_save.cpp" line="-296"/>
+ <location line="+21"/>
+ <location line="+7"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
+ <source>Audio</source>
+ <translation>音频</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-74"/>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
+ <location line="+32"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
+ <location line="+35"/>
+ <source>Codec</source>
+ <translation>编译码器</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-107"/>
+ <source>Display only error alerts</source>
+ <translation>只显示错误警告</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-357"/>
+ <location line="+27"/>
+ <location line="+24"/>
+ <location line="+8"/>
+ <location line="+4"/>
+ <location filename="../../common/gui_save.cpp" line="+183"/>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+33"/>
+ <source>HQ AC</source>
+ <translation>HQ AC</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+31"/>
+ <source>Mixer</source>
+ <translation>混音频</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="-214"/>
+ <location line="+255"/>
+ <location line="+26"/>
+ <source>Muxer</source>
+ <translation>复合器</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+28"/>
+ <source>Paste</source>
+ <translation>粘贴</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <location filename="../../common/gui_save.cpp" line="+99"/>
+ <location line="+10"/>
+ <source>Queue</source>
+ <translation>工作清单</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+85"/>
+ <source>Retry</source>
+ <translation>再试一次</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-2"/>
+ <source>VDPAU</source>
+ <translation>VDPAU</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+33"/>
+ <source>Max Overflow Improvement(%)</source>
+ <translation>改进最大溢出(%)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="-140"/>
+ <location line="+12"/>
+ <location line="+16"/>
+ <location line="+8"/>
+ <source>Video</source>
+ <translation>视频</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
+ <translation>不能设置音频编码器，请确保您的数据流是兼容音频编码器(数字频道、比特速率、格式）</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+9"/>
+ <source>Overflow Control Strength</source>
+ <translation>溢出控制强度</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
+ <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已编译，没有 VDPAUA 的支持，但它已编译应用程序，安装不匹配</translation>
+ </message>
+ <message>
+ <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
+ <source>Disabled</source>
+ <translation>禁用</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
+ <source>Pro Logic II</source>
+ <translation>第二代定向逻辑</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="-73"/>
+ <source>Cannot instantiate video chain</source>
+ <translation>不能安装视频链</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+54"/>
+ <source>Decoder Option</source>
+ <translation>译码器选项</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-125"/>
+ <source>Enable 3DNOWEXT</source>
+ <translation>启用 3DNOWEXT</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
+ <source>Previous Black Frame</source>
+ <translation>转到上一帧黑框</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
+ <source>can&apos;t write to file &quot;%s&quot;: %s
+%s
+</source>
+ <translation>不&apos;能写入文件&quot;%s&quot;: %s
+ %s</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-119"/>
+ <source>Main Audio Track</source>
+ <translation>主要音轨</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+ <source>Shift Value (ms):</source>
+ <translation>转变音量 (ms):</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-675"/>
+ <source>Error while cutting out.</source>
+ <translation>剪切时发生错误</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-52"/>
+ <source>R_esampling (Hz):</source>
+ <translation>重复_取样 (Hz):</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+0"/>
+ <source>Cannot add job %s</source>
+ <translation>不能增加工作 %s</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+124"/>
+ <source>Pro Logic</source>
+ <translation>定向逻辑</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+629"/>
+ <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 line="+6"/>
+ <source>Too short</source>
+ <translation>太短</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+571"/>
+ <source>Marker A &gt; B</source>
+ <translation>标记 A &gt; B</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-82"/>
+ <location line="+85"/>
+ <source>Please free up some space and press RETRY to try again.</source>
+ <translation>请释放一些空间，然后按重试再试一次。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-82"/>
+ <source>Connect to avsproxy</source>
+ <translation>联机至 avsproxy</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+97"/>
+ <source>GUI Rendering Options</source>
+ <translation>GUI 渲染选项</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="-141"/>
+ <location line="+255"/>
+ <source>Cannot instantiate muxer</source>
+ <translation>不能安装复合器</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+517"/>
+ <source>This function is disabled or no longer valid</source>
+ <translation>此功能被禁用或不再有效</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-56"/>
+ <source>Max B Frames</source>
+ <translation>Max B 模式</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-48"/>
+ <source>BMP op failed</source>
+ <translation>BMP 通过失败</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+18"/>
+ <source>Stereo+center+surround</source>
+ <translation>立体+中央+环绕</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+61"/>
+ <source>Build Option</source>
+ <translation>建立选项</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+45"/>
+ <source>I-frames closer than...</source>
+ <translation>比I-帧更接近...</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+27"/>
+ <source>_Filter strength:</source>
+ <translation>_过滤强度:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-2"/>
+ <location line="+11"/>
+ <source>__unknown__</source>
+ <translation>__未知__</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-1583"/>
+ <source>Select script to run</source>
+ <translation>选择脚本去执行</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-99"/>
+ <source>No downmixing</source>
+ <translation>没降混合</translation>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>Enable SSE2</source>
+ <translation>启用 SSE2</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Enable SSE3</source>
+ <translation>启用 SSE3</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>_Revert to saved default output settings on video load</source>
+ <translation>_在视频负载时还原到保存的默认输出设置上</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+64"/>
+ <source>Audio Device Plugins</source>
+ <translation>插件-音频装置(ADM)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+1079"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
+ <source>Something bad happened</source>
+ <translation>有些事发生问题</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+6"/>
+ <source>MSADPCM</source>
+ <translation>MSADPCM</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-13"/>
+ <source>Cannot delete the selection.</source>
+ <translation>无法删除此选取范围。</translation>
+ </message>
+ <message>
+ <location line="-358"/>
+ <source>Multiple Audio Tracks</source>
+ <translation>多音轨</translation>
+ </message>
+ <message>
+ <location line="-336"/>
+ <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"/>
+ <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>
+ <message>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <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>
+ </message>
+ <message>
+ <location line="+24"/>
+ <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"/>
+ <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="+305"/>
+ <source>Something failed when appending</source>
+ <translation>当增加时某些事情失败</translation>
+ </message>
+ <message>
+ <location line="+618"/>
+ <source>Failed to connect to avsproxy.
+Is it running ?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-472"/>
+ <source>Select Workbench to Save</source>
+ <translation>选择工作台进行保存</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+2"/>
+ <source>Re_verse UP and DOWN arrow keys for navigation</source>
+ <translation>反_转向上和向下箭头键进行导航</translation>
+ </message>
+ <message>
+ <location line="+84"/>
+ <source>SDL (good)</source>
+ <translation>SDL (好)</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-95"/>
+ <location line="+85"/>
+ <source>quota exceeded</source>
+ <translation>超出额配</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+119"/>
+ <source>User Interface</source>
+ <translation>用户接口</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="+26"/>
+ <source>Cannot open </source>
+ <translation>不能开启</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+17"/>
+ <source>G_ain value:</source>
+ <translation>增_益值:</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Shift audio:</source>
+ <translation>转变音频</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-24"/>
+ <source>Max Gop Size</source>
+ <translation>最大Gop(图像群组)大小</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="-300"/>
+ <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+ <translation>重用以前首先传递数据？警告，设置必须关闭</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+2"/>
+ <source>IMA ADPCM</source>
+ <translation>IMA ADPCM</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+6"/>
+ <source>Open Application Data &amp;Folder</source>
+ <translation>开启应用程序文件夹 &amp;目录</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-161"/>
+ <source>Above normal</source>
+ <translation>高于一般</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-1423"/>
+ <source>Select script to save</source>
+ <translation>选择脚本去保存</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-1"/>
+ <source>Min Gop Size</source>
+ <translation>最小Gop(图像群组)大小</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+9"/>
+ <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
+</source>
+ <translation>不&apos;能写入文件&quot;%s&quot;: %u (%s)</translation>
+ </message>
+ <message>
+ <source>Create _OpenDML files</source>
+ <translation type="vanished">建立 _开启DML 文件</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+250"/>
+ <source>Select Video File to Append...</source>
+ <translation>选择视频去附加合并(二视带宽高比要一致)...</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-28"/>
+ <source>Enable SSSE3</source>
+ <translation>启用 SSSE3</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-58"/>
+ <source>Video Encoder Plugins</source>
+ <translation>插件-视频编码器(ADM)</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Video Decoder Plugins</source>
+ <translation>插件-视频译码器(ADM)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+1020"/>
+ <source>Unable to set the audio language: No video loaded yet!</source>
+ <translation>无法设置音频语言：仍然未载入视频！</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-14"/>
+ <source>Select Track</source>
+ <translation>选择音频音轨</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+1"/>
+ <source>_Swap U and V</source>
+ <translation>_U和V交换色彩</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <source>Below normal</source>
+ <translation>低于一般</translation>
+ </message>
+ <message>
+ <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
+ <source>Auto-detect</source>
+ <translation>自动侦测</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+ <source>_Encoding priority:</source>
+ <translation>_编码优先次序:</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-30"/>
+ <source>Dolby Pro Logic</source>
+ <translation>杜比定向逻辑</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <source>Enable 3DNOW</source>
+ <translation>启用 3DNOW</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+117"/>
+ <source>Muxer Plugins</source>
+ <translation>插件-复合器(ADM)</translation>
+ </message>
+ <message>
+ <location line="-30"/>
+ <source>Demuxer Plugins</source>
+ <translation>插件-分离器(ADM)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
+ <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已编译没有 DXVA2 的支持，但它已编译应用程序，安装不匹配</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="+14"/>
+ <source>Cannot select FLV1 codec.</source>
+ <translation>不能选择 FLV1 编译码器。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+1"/>
+ <source>Dolby Pro Logic II</source>
+ <translation>第二代杜比定向逻辑</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="+27"/>
+ <source>Cannot select MPEG-4 SP codec.</source>
+ <translation>不能选择 MPEG-4 SP 编译码器。</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+2"/>
+ <source>GOP Size</source>
+ <translation>最小Gop(图像群组)大小</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-616"/>
+ <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
+ <translation>尝试 &apos;文件&apos; -&gt; &apos;加载/执行 项目...&apos;</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="-79"/>
+ <source>No AAC audio encoder plugin found.</source>
+ <translation>发现没有 AAC 音频编码器插件。</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+811"/>
+ <source>Frame Hex Dump</source>
+ <translation>帧十六进制转储</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+19"/>
+ <source>_Mixer:</source>
+ <translation>_混合器:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Audio Filters</source>
+ <translation>音频过滤</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-2"/>
+ <source>PAL 4:3</source>
+ <translation>PAL 4:3</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-3"/>
+ <source>AMR-NB</source>
+ <translation>AMR-NB</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-865"/>
+ <source>Permission error</source>
+ <translation>权限许可错误</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
+ <source>_Job name:</source>
+ <translation>_工作名称:</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
+ <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已编译，没有 LIBVA 的支持，但它已编译应用程序，安装不匹配</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+678"/>
+ <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"/>
+ <source>OpenGL (best)</source>
+ <translation>OpenGL (最好)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+13"/>
+ <source>Select JPEG Sequence to Save</source>
+ <translation>选择 JPEG 顺序进行保存</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <source>Append</source>
+ <translation>同宽高视频合并</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-86"/>
+ <source>can&apos;t open &quot;%s&quot;: %u (%s)
+</source>
+ <translation>不&apos;能开启&quot;%s&quot;: %u (%s)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
+ <location line="+2"/>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-1110"/>
+ <source>Not coded in this version</source>
+ <translation>没有编进这个版本</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+483"/>
+ <source>Failed</source>
+ <translation>已失败</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+19"/>
+ <source>Two Pass Tuning</source>
+ <translation>2 通调优</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+3"/>
+ <source>Output _File:</source>
+ <translation>输出_文件:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+79"/>
+ <source>Ignore</source>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <source>Failed to connect to avsproxy.
+ Is it running ?</source>
+ <translation type="vanished">无法联机到 avs代理，
+要继续执行吗?</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+870"/>
+ <source>No error found</source>
+ <translation>没有找到错误</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+53"/>
+ <source>Next Intra Frame</source>
+ <translation>转到下一帧(关键帧或I帧)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="-14"/>
+ <location line="+14"/>
+ <location line="+31"/>
+ <location line="+6"/>
+ <location line="+15"/>
+ <location line="+27"/>
+ <location line="+35"/>
+ <source>Codec Error</source>
+ <translation>编译码器错误</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+ <source>Internal error finding codec 0x%x</source>
+ <translation>发现编译码器内部错误</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+50"/>
+ <source>Master</source>
+ <translation>主要</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-57"/>
+ <source>Medium</source>
+ <translation>中</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Motion</source>
+ <translation>运动</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-514"/>
+ <source>Job name</source>
+ <translation>工作名称</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+52"/>
+ <source>Muxers</source>
+ <translation>复合器</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+427"/>
+ <source>Saved %d images.</source>
+ <translation>已保存 %d 个图像。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
+ <source>Normal</source>
+ <translation>一般</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-71"/>
+ <location line="+2"/>
+ <source>Clear recent items</source>
+ <translation>清除最近使用的 文件 及 项目</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-58"/>
+ <source>Decode video using DXVA2 (windows)</source>
+ <translation>译码视频使用 DXVA2 (windows)</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-39"/>
+ <source>Motion Search Precision</source>
+ <translation>运动搜索精度</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+225"/>
+ <source>Output</source>
+ <translation>输出</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-188"/>
+ <source>Cannot create stream</source>
+ <translation>不能建立流</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-204"/>
+ <source>Enable all SIMD</source>
+ <translation>启用所有 SIMD</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-11"/>
+ <source>Remix:</source>
+ <translation>重新混合</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
+ <source>You cannot remove *all* the video
+</source>
+ <translation>你不能删除*所有*的视频</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-19"/>
+ <source>Decode video using XVBA (AMD)</source>
+ <translation>译码视频使用 XVBA (AMD)</translation>
+ </message>
+ <message>
+ <location line="+164"/>
+ <source>_AudioDevice</source>
+ <translation>_音频装置</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-171"/>
+ <source>Saving</source>
+ <translation>保存中</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-29"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+ <source>Stereo</source>
+ <translation>立体声</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-11"/>
+ <source>WMAPRO</source>
+ <translation>WMAPRO</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+7"/>
+ <source>Wide Search</source>
+ <translation>广泛搜寻</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-1042"/>
+ <source>Select script to debug</source>
+ <translation>选择脚本去调试</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+20"/>
+ <source>More Search</source>
+ <translation>更多搜寻</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+7"/>
+ <source>Ogg Vorbis</source>
+ <translation>Ogg Vorbis</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-22"/>
+ <source>Limited Search</source>
+ <translation>限度搜寻</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-1"/>
+ <source>XVideo</source>
+ <translation>XVideo</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+1"/>
+ <source>PAL 16:9</source>
+ <translation>PAL 16:9</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
+ <source>First Frame</source>
+ <translation>转到第一帧(开始)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+604"/>
+ <source>Cannot open &quot;%s&quot;.</source>
+ <translation>无法开启 &quot;%s&quot;。</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+1"/>
+ <source>Medium Search</source>
+ <translation>中等搜寻</translation>
+ </message>
+ <message>
+ <source>The video has been saved but seems to be incomplete.</source>
+ <translation type="vanished">视频已保存，但似乎并不完整。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-115"/>
+ <source>Video Decoder</source>
+ <translation>视频译码器</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+1"/>
+ <source>Last Frame</source>
+ <translation>转到最后一帧(结束)</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Next Frame</source>
+ <translation>转到下一帧</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-246"/>
+ <source>Cannot reach database. Do you have Job control running ?</source>
+ <translation>不能到达数据库，你有工作控制执行吗？</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+19"/>
+ <source>Zoom 1:1</source>
+ <translation>缩放 1:1</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Zoom 1:2</source>
+ <translation>缩放 1:2</translation>
+ </message>
+ <message>
+ <location line="-104"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Zoom 1:4</source>
+ <translation>缩放 1:4</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Zoom 2:1</source>
+ <translation>缩放 2:1</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+34"/>
+ <source>Audio Encoder Plugins</source>
+ <translation>插件-音频编码器(ADM)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
+ <source>DXVA2 (best)</source>
+ <translation>DXVA2 (最好)</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>No alerts</source>
+ <translation>不显示任何警告</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+43"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+246"/>
+ <source>Cannot compile shader</source>
+ <translation>无法编译着色器</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-89"/>
+ <source>can&apos;t open &quot;%s&quot;: %s
+%s
+</source>
+ <translation>不&apos;能开启&quot;%s&quot;: %s
+ %s</translation>
+ </message>
+ <message>
+ <source>Aborting.</source>
+ <translation type="vanished">正在中止。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-2"/>
+ <source>No change</source>
+ <translation>没有改变</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-533"/>
+ <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>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-9"/>
+ <location line="+3"/>
+ <source>Sdl driver</source>
+ <translation>Sdl 驱动程序r</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+137"/>
+ <source>No engine</source>
+ <translation>没有引擎</translation>
+ </message>
+ <message>
+ <location line="+400"/>
+ <source>&quot;%s&quot; does not exist.</source>
+ <translation>&quot;%s&quot; 不存在。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
+ <source>Save as BMP</source>
+ <translation>另存 BMP</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
+ <source>Building time map</source>
+ <translation>建立时间轴</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
+ <source>Decode video using VDPAU (NVIDIA)</source>
+ <translation>译码视频使用 VDPAU (NVIDIA)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="+1"/>
+ <source>You don&apos;t have FAAC!.
+It is needed to create PSP compatible video.</source>
+ <translation>你没&apos;有FAAC!，它是建立 PSP 兼容视频所需。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+ <source>Load saved settings</source>
+ <translation>载入保存设置</translation>
+ </message>
+ <message>
+ <source>_Split MPEG files every (MB):</source>
+ <translation type="vanished">_大文件自动分割每个 MPEG 档为(MB):</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+859"/>
+ <source>Frame size:</source>
+ <translation>帧大小:</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Frame type:</source>
+ <translation>帧类型:</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+24"/>
+ <source>Plugins</source>
+ <translation>插件</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
+ <source>VDPAU (best)</source>
+ <translation>VDPAU (最好)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="-129"/>
+ <source>Cannot select the MPEG-4 SP codec.</source>
+ <translation>不能选择的 MPEG-4 SP 编译码器。</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-3"/>
+ <location line="+1"/>
+ <source>NTSC 16:9</source>
+ <translation>NTSC 16:9</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="+263"/>
+ <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>这个视频是在复制模式，但剪切的点不是在关键帧(I帧)上，该视频将被保存，但会有缺陷在切割点。</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-858"/>
+ <source>File error</source>
+ <translation>文件错误</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-8"/>
+ <source>Save audio</source>
+ <translation>保存音频音轨</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
+ <source>%d minute(s)</source>
+ <translation>%d 分(s)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+61"/>
+ <source>_Volume control:</source>
+ <translation>_音量控制:</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Default Postprocessing</source>
+ <translation>默认的后置处理</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="-91"/>
+ <location line="+24"/>
+ <source>Cannot create encoder</source>
+ <translation>不能建立编码器</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+18"/>
+ <source>Manual (dB)</source>
+ <translation>手册 (dB)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+4"/>
+ <source>x86-64</source>
+ <translation>x86-64</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+418"/>
+ <source>Checking video</source>
+ <translation>正在检查视频</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+497"/>
+ <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"/>
+ <source>_Enable alternative keyboard shortcuts</source>
+ <translation>_启用备用的键盘快捷方式</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Decode video using LIBVA (INTEL)</source>
+ <translation>译码视频使用 LIBVA (INTEL)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-369"/>
+ <source>Cannot open project using the video loader.</source>
+ <translation>使用视频加载器时无法开启项目。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+91"/>
+ <source>LIBVA (best)</source>
+ <translation>LIBVA (最好)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
+ <source>Film to PAL</source>
+ <translation>Film 转成 PAL</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-433"/>
+ <source>Select File to Save</source>
+ <translation>选择文件进行保存</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+150"/>
+ <source>_Limit Refresh Rate</source>
+ <translation>_限制重整速率</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-15"/>
+ <source>Select JPEG to Save</source>
+ <translation>选择 JPG 进行保存</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-50"/>
+ <source>Ultra High</source>
+ <translation>超高</translation>
+ </message>
+ <message>
+ <source>Fail to save as jpeg</source>
+ <translation type="vanished">失败另存Jpeg</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-5"/>
+ <source>Resampling frequency (Hz)</source>
+ <translation>重复取样频率 (Hz)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+629"/>
+ <source>Setting the language for the given track index is not possible: Invalid track index!</source>
+ <translation>设置的语言无法提供跟踪索引：无效跟踪指标！</translation>
+ </message>
+ <message>
+ <source>Cannot decode frame</source>
+ <translation type="vanished">无法译码帧</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-172"/>
+ <source>_Default to the directory of the last read file for saving</source>
+ <translation>_默认为保存最后读取文件的目录</translation>
+ </message>
+ <message>
+ <location line="+138"/>
+ <source>_Language</source>
+ <translation>_语言</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-58"/>
+ <source>No file loaded</source>
+ <translation>没有文件加载</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-582"/>
+ <source>The file you just loaded contains several audio tracks.
+Go to Audio-&gt;MainTrack to select the active one.</source>
+ <translation>这文件刚刚加载包含一些音频轨道。
+前往 音频-&gt;主要轨道 来选择作用中的轨道。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-63"/>
+ <source>Video Encoder</source>
+ <translation>视频编码器</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+ <source>Threading</source>
+ <translation>线程</translation>
+ </message>
+ <message>
+ <location line="-106"/>
+ <source>_Strength:</source>
+ <translation>_强度:</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+23"/>
+ <source>Play/Stop</source>
+ <translation>播放/停止</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+3"/>
+ <source>Save Job</source>
+ <translation>保存工作</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-156"/>
+ <source>_Check for new release</source>
+ <translation>_检查有新版本</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>_Indexing/unpacking priority:</source>
+ <translation>_索引/拆开打包的优先次序:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>De_ringing</source>
+ <translation>去除_环状色斑</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+12"/>
+ <source>_Deringing</source>
+ <translation>_去除环状色斑</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
+ <source>8-bit PCM</source>
+ <translation>8比特 PCM</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-12"/>
+ <source>Turbo mode</source>
+ <translation>加速模式</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Key Frame Boost(%)</source>
+ <translation>关键帧提高(%)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-149"/>
+ <source>Enable MMX</source>
+ <translation>启用 MMX</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Enable SSE</source>
+ <translation>启用 SSE</translation>
+ </message>
+ <message>
+ <location line="-17"/>
+ <source>If you use Hw decoding, it is better to use the matching display driver</source>
+ <translation>如果你使用硬件译码，最好使用匹配的显示驱动程序</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+2"/>
+ <location line="+85"/>
+ <source>filesystem full</source>
+ <translation>文件系统已满</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+257"/>
+ <location line="+3"/>
+ <source>HW Accel</source>
+ <translation>HW 硬件加速器</translation>
+ </message>
+ <message>
+ <location line="-257"/>
+ <source>_Accept non-standard audio frequency for DVD</source>
+ <translation>_同意在 DVD 使用非标准的音频频率</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-30"/>
+ <source>Chroma ME</source>
+ <translation>色度 ME</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+ <source>Enable MMXEXT</source>
+ <translation>启用 MMXEXT</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-79"/>
+ <source>Information</source>
+ <translation>属性</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-2"/>
+ <source>NTSC 4:3</source>
+ <translation>NTSC 4:3</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+7"/>
+ <source>Libraries</source>
+ <translation>函式库</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="-16"/>
+ <source>An audio track is necessary to create such file</source>
+ <translation>音频轨道有必要建立这样的档</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+518"/>
+ <source>Cannot use that file as audio track</source>
+ <translation>不能使用该档作为音频轨道</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+43"/>
+ <source>Prioritisation</source>
+ <translation>优化</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+35"/>
+ <source>Max Overglow Degradation(%)</source>
+ <translation>退化最大溢出(%)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+5"/>
+ <source>Built-in Support</source>
+ <translation>内建的支援</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-62"/>
+ <source>Very High</source>
+ <translation>非常高</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-1250"/>
+ <source>Select script/project to run</source>
+ <translation>选择要执行的脚本/项目</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+215"/>
+ <source>_Always ask which port to use</source>
+ <translation>_制作视频始终询问要使用哪个埠(Avidemux+Avisynth)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+89"/>
+ <source>Go To Marker A</source>
+ <translation>将标记A(选择开始)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Go To Marker B</source>
+ <translation>将标记B(选择结束)</translation>
+ </message>
+ <message>
+ <source>Could not save all images.</source>
+ <translation type="vanished">无法保存所有图像。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+19"/>
+ <source>Stereo front+stereo rear</source>
+ <translation>前段立体+后段立体</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-53"/>
+ <source>Pr&amp;eferences</source>
+ <translation>首选项&amp;-偏好设置</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+69"/>
+ <source>Low Bitrate Scenes (%)</source>
+ <translation>低比特率的场景（%）</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
+ <source>Trouble initializing audio device</source>
+ <translation>音频装置初始化时发生问题</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
+ <source>Core has been compiled without XVBA support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已编译，没有 XVBA 的支持，但它已编译应用程序，安装不匹配</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-179"/>
+ <source>Video _display:</source>
+ <translation>视频 _显示:</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-1"/>
+ <source>High Bitrate Scenes (%)</source>
+ <translation>高比特率场景（%）</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+ <source>_Vertical deblocking</source>
+ <translation>_去除垂直方向块状色斑</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+1074"/>
+ <source>Errors found in %u frames</source>
+ <translation>在 %u 帧中发现错误</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+ <source>_Local playback downmixing:</source>
+ <translation>_局部倒带降混合:</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>Display all alerts</source>
+ <translation>显示所有警告</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-20"/>
+ <source>Fontconfig</source>
+ <translation>Fontconfig</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
+ <source>TimeStamp:</source>
+ <translation>时间戳</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+1"/>
+ <source>FreeType 2</source>
+ <translation>自由型 2</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-576"/>
+ <location line="+21"/>
+ <source>Cutting</source>
+ <translation>剪切</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+52"/>
+ <source>Select BMP to Save</source>
+ <translation>选择 BMP 进行保存</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+27"/>
+ <source>A few seconds</source>
+ <translation>几秒钟</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+474"/>
+ <source>File %s has been successfully saved.</source>
+ <translation>文件 %s 已经成功地保存。</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="-2"/>
+ <source>Less than a minute</source>
+ <translation>不到一分钟</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+48"/>
+ <source>Next Black Frame</source>
+ <translation>转到下一帧黑框</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+ <source>Display</source>
+ <translation>显示</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+3"/>
+ <source>Go to Time</source>
+ <translation>前往时间点</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+7"/>
+ <source>Go To Time</source>
+ <translation>前往时间点</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-210"/>
+ <source>Multi-threading</source>
+ <translation>多线程</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+12"/>
+ <source>Xvid4 Configuration</source>
+ <translation>Xvid4 配置</translation>
+ </message>
+ <message>
+ <location line="-62"/>
+ <source>Advanced Simple Profile</source>
+ <translation>高级简单设置檔(ASP)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-2"/>
+ <source>Stereo+center</source>
+ <translation>立体+中央</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>PAL to Film</source>
+ <translation>PAL 转成 Film</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
+ <source>Reset Markers</source>
+ <translation>取消标记</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+230"/>
+ <source>Default port to use</source>
+ <translation>制作视频要使用默认埠(Avidemux)</translation>
+ </message>
+ <message>
+ <location line="-147"/>
+ <source>_Message level:</source>
+ <translation>_讯息级别:</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+576"/>
+ <source>You can&apos;t remove all frames</source>
+ <translation>你不&apos;能移除所有的帧</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+32"/>
+ <source>&amp;Advanced</source>
+ <translation>&amp;高级</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-128"/>
+ <source>Enable openGl support</source>
+ <translation>启用openGl支援</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-859"/>
+ <source>tinyPy script is not enabled in this build</source>
+ <translation>在生成中未启用 tinyPy 脚本</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_savenew.cpp" line="-8"/>
+ <source>Cannot setup codec. Bitrate too low?</source>
+ <translation>无法安装编译码器，比特率太低？</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-511"/>
+ <source>Output file</source>
+ <translation>输出文件</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-25"/>
+ <location line="+68"/>
+ <source>Select Video File...</source>
+ <translation>选择视频檔...</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+3"/>
+ <source>Unknown codec</source>
+ <translation>未知的编译码器</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="-3"/>
+ <source>Select Video To Write</source>
+ <translation>选择视频来写入</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+114"/>
+ <source>Demuxers</source>
+ <translation>分离器</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+7"/>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-44"/>
+ <source>Reset Edit</source>
+ <translation>取消编辑</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Save current settings as default</source>
+ <translation>将当前设置保存为默认值</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-28"/>
+ <source>C_hroma optimizer</source>
+ <translation>色度_优化器</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Very Low</source>
+ <translation>非常慢</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_autodrive.cpp" line="+62"/>
+ <source>The MP3 codec does not allow disabling reservoir.
+Install lame plugin</source>
+ <translation>MP3 编译码器不允许禁用资源，安装了 lame插件</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+ <source>Save as Image</source>
+ <translation>另存图片</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+285"/>
+ <source>Preferences</source>
+ <translation>首选项-偏好设置</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+912"/>
+ <source>_Track from video:</source>
+ <translation>_视频中的轨道:</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+19"/>
+ <source>Quarter Pixel</source>
+ <translation>1/4像素</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+120"/>
+ <source>Saving audio</source>
+ <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>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-29"/>
+ <source>_Interlaced</source>
+ <translation>_交错字段</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+75"/>
+ <source>Open Application &amp;Log</source>
+ <translation>开启应用程序 &amp;Log</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+99"/>
+ <source>Function not implemented
+</source>
+ <translation>函数尚未执行</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-20"/>
+ <location line="+9"/>
+ <source>Filters</source>
+ <translation>过滤器</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-21"/>
+ <source>_lavc threads:</source>
+ <translation>_lavc 线程:</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+60"/>
+ <source>Quantization Matrix</source>
+ <translation>量化矩阵</translation>
+ </message>
+ <message>
+ <location line="-58"/>
+ <source>_Greyscale</source>
+ <translation>_灰阶</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+195"/>
+ <source>Refresh Rate Cap (ms)</source>
+ <translation>重整速率上限 (ms)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-24"/>
+ <source>Set Marker A</source>
+ <translation>设置标记 A</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set Marker B</source>
+ <translation>设置标记 B</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+32"/>
+ <location line="+7"/>
+ <source>Invalid audio index given</source>
+ <translation>提供的音频索引无效</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+22"/>
+ <source>VHQ Mode</source>
+ <translation>VHQ 模式</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+24"/>
+ <source>Automatic (max -3 dB)</source>
+ <translation>自动 (最大值 -3 dB)</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-23"/>
+ <source>Ca_rtoon mode</source>
+ <translation>卡通_模式</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+ <source>Previous Frame</source>
+ <translation>转到上一帧</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+225"/>
+ <source>AvsProxy</source>
+ <translation>AvsProxy</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-181"/>
+ <source>_Playback priority:</source>
+ <translation>_倒带优先次序:</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+5"/>
+ <source>avsproxy</source>
+ <translation>AvsProxy</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+105"/>
+ <source>_Horizontal deblocking</source>
+ <translation>_去除水平方向块状色斑</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
+ <source>Updating frametype</source>
+ <translation>更新帧类型</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-21"/>
+ <source>_Frame rate change:</source>
+ <translation>_帧率改变:</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+1"/>
+ <source>Gettext</source>
+ <translation>Gettext</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-84"/>
+ <source>Save as JPEG</source>
+ <translation>另存JPEG</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+86"/>
+ <source>Two Pass</source>
+ <translation>2通</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-770"/>
+ <source>Could not open the file</source>
+ <translation>无法开启此文件</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-26"/>
+ <source>Trellis Quantization</source>
+ <translation>网格量化</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
+ <source>Memory error</source>
+ <translation>内存错误</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+11"/>
+ <source>5 channels</source>
+ <translation>5 声道</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+13"/>
+ <source>.. are reduced by(%)</source>
+ <translation>介...是减少(%)。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
+ <source>Previous Intra Frame</source>
+ <translation>转到上一帧(关键帧或I帧)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+16"/>
+ <source>System language</source>
+ <translation>系统语言</translation>
+ </message>
+ <message>
+ <location line="-107"/>
+ <source>XVideo (best)</source>
+ <translation>XVideo (最好)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+269"/>
+ <location line="+43"/>
+ <source>The tinypy plugin is missing.
+Expect problems.</source>
+ <translation>Tinypy 插件是错误，期望的问题。</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-29"/>
+ <source>Audio Encoders</source>
+ <translation>音频编码器</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-160"/>
+ <location line="+268"/>
+ <source>Something bad happened (II)</source>
+ <translation>不幸的事情发生 (II)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+28"/>
+ <source>Saving failed</source>
+ <translation>保存失败</translation>
+ </message>
+ <message>
+ <location line="-220"/>
+ <source>Select File to Save Audio</source>
+ <translation>选择文件来保存音频</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="+168"/>
+ <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
+ <translation>未找到在清单中，即使它应该有的音频档，建立一个错误报告！</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
+ <source>PostProcessing</source>
+ <translation>后置处理</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="-18"/>
+ <source>%d hour(s)</source>
+ <translation>%d 时(s)</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-138"/>
+ <source>Audio Plugins</source>
+ <translation>插件-音频(ADM)</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="+502"/>
+ <source>Cannot get tinyPÿ script engine</source>
+ <translation>不能获得tinyPÿ脚本引擎</translation>
+ </message>
+ <message>
+ <source>Saving as set of jpegs</source>
+ <translation type="vanished">正在另存为整套 jpeg 檔</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+6"/>
+ <source>Curve Compression</source>
+ <translation>曲线压缩</translation>
+ </message>
+ <message>
+ <location line="-60"/>
+ <source>Mode Decision</source>
+ <translation>模式决定</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_save.cpp" line="-525"/>
+ <source>Queue job to jobList</source>
+ <translation>工作清单</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+35"/>
+ <source>Internal error opening 0x%x</source>
+ <translation>内部开启错误中 0x%x</translation>
+ </message>
+ <message>
+ <location filename="../../common/gui_main.cpp" line="-827"/>
+ <source>Are you sure?</source>
+ <translation>确定吗?</translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>admIvtc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+44"/>
+ <source>All in one ivtc.</source>
+ <translation>ADM ivtc:开放组织框架构的IVTC全功能合一交错过滤器。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>ADM ivtc.</source>
+ <translation>2.0-ADM ivtc多功能合一交错过滤器</translation>
+ </message>
+</context>
+<context>
+ <name>aften</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Aften Configuration</source>
+ <translation>经常配置</translation>
+ </message>
+</context>
+<context>
+ <name>asciiView</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <source>Ascii View</source>
+ <translation>1.5-ASCII视图(美国信息交换标准代码)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ascii view</source>
+ <translation>ASCII视图(美国信息交换标准代码)</translation>
+ </message>
+</context>
+<context>
+ <name>asfdemuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
+ <source>File Error.</source>
+ <translation>文件错误</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+471"/>
+ <source>Indexing</source>
+ <translation>正在索引</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+0"/>
+ <source>Cannot open file
+</source>
+ <translation>不能开启文件</translation>
+ </message>
+</context>
+<context>
+ <name>asharp</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="+65"/>
+ <source>Asharp</source>
+ <translation>5.2-自适应锐化(Asharp)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Adaptative sharpener by MarcFD.</source>
+ <translation>适性锐利化器，作者为 MarcFD。</translation>
+ </message>
+</context>
+<context>
+ <name>asharpDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui" line="+14"/>
+ <source>ASharp</source>
+ <translation>5.2-自适应锐化(Asharp)</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Threshold</source>
+ <translation>界限值</translation>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>Unknown flag</source>
+ <translation>未知的标志</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>Strength</source>
+ <translation>强度</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>Block Adaptative</source>
+ <translation>区块适性</translation>
+ </message>
+</context>
+<context>
+ <name>ass</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+179"/>
+ <source>ASS</source>
+ <translation>ASS</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <location line="+5"/>
+ <location line="+8"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source>Fonts</source>
+ <translation>字型</translation>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>Cannot load this srt file.</source>
+ <translation>不能载入srt檔</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>This is a srt file. Convert to SSA ?</source>
+ <translation>这是一个 srt 档，将转换为 SSA？</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Botto_m margin</source>
+ <translation>底_部边界</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Font scale:</source>
+ <translation>_字体缩放:</translation>
+ </message>
+ <message>
+ <location line="-43"/>
+ <source>Are you sure this is an ass file ?</source>
+ <translation>你确认是ass档吗?</translation>
+ </message>
+ <message>
+ <location line="+158"/>
+ <source>SSA Error</source>
+ <translation>SSA错误</translation>
+ </message>
+ <message>
+ <location line="-117"/>
+ <source>Select Subtitle file</source>
+ <translation>选择字幕档</translation>
+ </message>
+ <message>
+ <location line="+117"/>
+ <source>Cannot read_file for *%s*</source>
+ <translation>无法读取_文件为 * %s *</translation>
+ </message>
+ <message>
+ <location line="-116"/>
+ <source>_Line spacing:</source>
+ <translation>_行距:</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Preparing the fonts can take a few minutes the first time.
+This message will not be displayed again.</source>
+ <translation>准备的字体可以花几分钟第一次，不会再显示此消息。</translation>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>_Top margin:</source>
+ <translation>_顶部边界:</translation>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Format ?</source>
+ <translation>格式 ?</translation>
+ </message>
+ <message>
+ <location line="-63"/>
+ <source>SSA/ASS/SRT</source>
+ <translation>6.1-字型文件SSA/ASS/SRT扩展名格式</translation>
+ </message>
+ <message>
+ <location line="+104"/>
+ <source>_Subtitle file (ASS/SSA):</source>
+ <translation>_字幕檔(ASS/SSA):</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Cannot convert to ssa.</source>
+ <translation>不能转换ssa檔</translation>
+ </message>
+ <message>
+ <location line="-130"/>
+ <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+ <translation>编码-扩展名兼容的.ass/.ssa/.srt字幕，请汇入文本檔。</translation>
+ </message>
+ <message>
+ <location line="+138"/>
+ <source>Cannot save converted file.</source>
+ <translation>不能保存转换档</translation>
+ </message>
+</context>
+<context>
+ <name>avimuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+ <source>Muxing Format</source>
+ <translation>复合格式</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+84"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot create AVI file</source>
+ <translation>不能建立AVI檔</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Bad Idea</source>
+ <translation>坏主意</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
+ Do you want to continue anyway ?</source>
+ <translation>使用H264/H265中AVI是个坏主意，MKV是好了点，你想要继续吗？</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+3"/>
+ <source>Avi Muxer</source>
+ <translation>AVI 复合器选项</translation>
+ </message>
+</context>
+<context>
+ <name>avsfilter</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+599"/>
+ <source>Select wine filename[wine/cedega/etc.]</source>
+ <translation>选择wine文件名 [cedega/wine/等]。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>_wine app file:</source>
+ <translation>_wine用程序文件：</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>_loader file:</source>
+ <translation>_加载程序文件：</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select loader filename[avsload.exe]</source>
+ <translation>选择加载文件名称[avs加载.exe]</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_avs file:</source>
+ <translation>_avs 檔:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_pipe timeout:</source>
+ <translation>_管超时：</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>AvsFilter config</source>
+ <translation>Avs过滤器配置</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Select avs filename[*.avs]</source>
+ <translation>选择 avs 檔名[*.avs]</translation>
+ </message>
+</context>
+<context>
+ <name>bitrate</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+168"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location line="-116"/>
+ <source>Same Quantiser as Input</source>
+ <translation>量化值与输入来源相同</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Two Pass - Average Bitrate</source>
+ <translation>2通 - 平均比特率(ABR)</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Constant Bitrate</source>
+ <translation>固定比特率(CBR)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Constant Quantiser</source>
+ <translation>恒定量化器(QP模式)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Constant Rate Factor</source>
+ <translation>恒定速率系数(CRF)</translation>
+ </message>
+ <message>
+ <location line="+105"/>
+ <source>Target video size (MB)</source>
+ <translation>目标视频大小 (MB)</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <location line="+19"/>
+ <source>Quantizer</source>
+ <translation>量化器</translation>
+ </message>
+ <message>
+ <location line="-115"/>
+ <source>Encoding mode</source>
+ <translation>编码模式</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Bitrate</source>
+ <translation>比特率</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Two Pass - Video Size</source>
+ <translation>通 - 视频大小</translation>
+ </message>
+ <message>
+ <location line="+109"/>
+ <source>Average bitrate (kb/s)</source>
+ <translation>平均比特率(ABR)(kb/s)</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Target bitrate (kb/s)</source>
+ <translation>目标比特率 (kb/s)</translation>
+ </message>
+</context>
+<context>
+ <name>black</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
+ <source>Black</source>
+ <translation>1.4-设置视频为黑幕</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>_End time:</source>
+ <translation>_结束时间:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Replace by Black</source>
+ <translation>取代黑色</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Replace a section by black.</source>
+ <translation>设置视频某一段时间为黑幕</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>_Start time:</source>
+ <translation>_开始时间:</translation>
+ </message>
+</context>
+<context>
+ <name>blacken</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+ <source>Blacken Borders</source>
+ <translation>1.3-加入内边框填黑-框厚度不限</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Remove noisy edge by turning them to black.</source>
+ <translation>删除噪声边缘再涂黑，在总图片大小内涂黑边框，因此不影响图片大小</translation>
+ </message>
+</context>
+<context>
+ <name>blackenDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+59"/>
+ <source>Top:</source>
+ <translation>顶边</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Left:</source>
+ <translation>左边</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Reset</source>
+ <translation>重设</translation>
+ </message>
+ <message>
+ <location line="-88"/>
+ <source>Blacken Borders</source>
+ <translation>1.3-加入内边框填黑-框厚度不限</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>Right:</source>
+ <translation>右边</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Bottom:</source>
+ <translation>下边</translation>
+ </message>
+</context>
+<context>
+ <name>blackframes</name>
+ <message>
+ <location filename="../../common/gui_blackframes.cpp" line="+105"/>
+ <source>BlackFrame</source>
+ <translation>黑帧</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Searching black frame..</source>
+ <translation>搜寻黑帧</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>This function is unsupported at the moment</source>
+ <translation>此函数不受支持的那一刻</translation>
+ </message>
+</context>
+<context>
+ <name>changeFps</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+238"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location line="-195"/>
+ <source>29.97 (NTSC)</source>
+ <translation>29.97 (NTSC)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>50 (Pal)</source>
+ <translation>50 (Pal)</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>25 (PAL)</source>
+ <translation>25 (PAL)</translation>
+ </message>
+ <message>
+ <location line="+197"/>
+ <source>Invalid fps</source>
+ <translation>无效FPS(帧数/秒)</translation>
+ </message>
+ <message>
+ <location line="-198"/>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Change FPS</source>
+ <translation>1.0-改变帧速度</translation>
+ </message>
+ <message>
+ <location line="+156"/>
+ <source>Change fps</source>
+ <translation>改变FPS(帧数/秒)</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>Source frame rate:</source>
+ <translation>源头帧播放速率 :</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Destination frame rate:</source>
+ <translation>目的地帧播放速率 :</translation>
+ </message>
+ <message>
+ <location line="-183"/>
+ <source>23.976 (Film)</source>
+ <translation>23.976 (Film)</translation>
+ </message>
+ <message>
+ <location line="+177"/>
+ <source>Source Fps:</source>
+ <translation>源头 Fps :</translation>
+ </message>
+ <message>
+ <location line="-174"/>
+ <source>59.93 (NTSC)</source>
+ <translation>59.93 (NTSC)</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
+ <translation>视频快慢改变fps(帧/秒)的速度，这过滤可以改变时间</translation>
+ </message>
+ <message>
+ <location line="+146"/>
+ <source>Destination Fps:</source>
+ <translation>目的地 Fps:</translation>
+ </message>
+</context>
+<context>
+ <name>chromashift</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+35"/>
+ <source>ChromaShift</source>
+ <translation>3.5-色度位移</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
+ <translation>改变色度 U/V 来修复糟糕的明度/色度同步。</translation>
+ </message>
+</context>
+<context>
+ <name>chromashiftDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
+ <source>ChromaShift</source>
+ <translation>3.5-色度位移</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>U Shift</source>
+ <translation>U 位移</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>V Shift</source>
+ <translation>V 位移</translation>
+ </message>
+</context>
+<context>
+ <name>coloryuv</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+115"/>
+ <source>U</source>
+ <translation>U</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>V</source>
+ <translation>V</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Y</source>
+ <translation>Y</translation>
+ </message>
+ <message>
+ <location line="-36"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Flags</source>
+ <translation>旗标记</translation>
+ </message>
+ <message>
+ <location line="-31"/>
+ <source>Levels:</source>
+ <translation>级别</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>PC-&gt;TV</source>
+ <translation>PC-&gt;TV</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Color management filter.</source>
+ <translation>颜色管理过滤器</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>U gain</source>
+ <translation>U 增益</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>V gain</source>
+ <translation>V 增益</translation>
+ </message>
+ <message>
+ <location line="-26"/>
+ <source>TV-&gt;PC</source>
+ <translation>TV-&gt;PC</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Y gain</source>
+ <translation>Y 增益</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>colorYuv</source>
+ <translation>颜色Yuv</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>V Contrast</source>
+ <translation>V 对比</translation>
+ </message>
+ <message>
+ <location line="-17"/>
+ <source>Y Contrast</source>
+ <translation>Y 对比</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>U Contrast</source>
+ <translation>U 对比</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Y Brightness</source>
+ <translation>Y 亮度</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>V Brightness</source>
+ <translation>V 亮度</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>U Brightness</source>
+ <translation>U 亮度</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Clip to Tv Range (16-235)</source>
+ <translation>剪辑电视系列 (16-235)</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Y Gamma</source>
+ <translation>Y 伽马射线</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>AutoWhite</source>
+ <translation>自动白</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>AutoGain</source>
+ <translation>自动增益</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Avisynth color filter.</source>
+ <translation>3.3-Avisynth颜色过滤器</translation>
+ </message>
+</context>
+<context>
+ <name>contrast</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+35"/>
+ <source>Adjust contrast, brightness and colors.</source>
+ <translation>调整对比、亮度和色彩。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
+ <location line="+90"/>
+ <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"/>
+ <source>Brightness</source>
+ <translation>亮度</translation>
+ </message>
+</context>
+<context>
+ <name>contrastDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui" line="+127"/>
+ <source>Luma</source>
+ <translation>明度</translation>
+ </message>
+ <message>
+ <location line="-113"/>
+ <location line="+19"/>
+ <source>Contrast</source>
+ <translation>对比</translation>
+ </message>
+ <message>
+ <location line="+101"/>
+ <source>Process</source>
+ <translation>程序</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>MPEG2-&gt;PC</source>
+ <translation>MPEG2-&gt;PC</translation>
+ </message>
+ <message>
+ <location line="-43"/>
+ <source>ChromaU</source>
+ <translation>色度U</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>ChromaV</source>
+ <translation>色度V</translation>
+ </message>
+ <message>
+ <location line="-94"/>
+ <source>Contrast </source>
+ <translation>对比 </translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Brightness</source>
+ <translation>亮度</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Brightness </source>
+ <translation>亮度 </translation>
+ </message>
+</context>
+<context>
+ <name>convolution</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+141"/>
+ <source>Fast Convolution</source>
+ <translation>快速卷积</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Process luma plane</source>
+ <translation>处理明度平面</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>_Process luma</source>
+ <translation>_处理明度</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>P_rocess chroma</source>
+ <translation>处_理色度</translation>
+ </message>
+</context>
+<context>
+ <name>crash</name>
+ <message>
+ <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
+ <source>Load it</source>
+ <translation>载入它</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Crash file</source>
+ <translation>损坏档</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>I have detected a crash file. 
+Do you want to load it ?
+(It will be deleted in all cases, you should save it if you want to keep it)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>I have detected a crash file.
+Do you want to load it ?
+(It will be deleted in all cases, you should save it if you want to keep it)</source>
+ <translation type="vanished">侦测到一个损坏档。
+是否要加载 ?
+(在所有的案例都会侦测，若要保存它你必须执行保存)</translation>
+ </message>
+</context>
+<context>
+ <name>crop</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+ <source>Crop</source>
+ <translation>1.2-剪切视频边框尺寸</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Crop filter</source>
+ <translation>剪切过滤</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Warning Cropping too much width ! Width reseted !
+</source>
+ <translation>复位的宽度！剪切太多宽度的警告！</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning Cropping too much height ! Height reseted !
+</source>
+ <translation>复位的宽度！剪切太多宽度的警告！</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>cropDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
+ <source>Crop</source>
+ <translation>剪切</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+68"/>
+ <source>Top:</source>
+ <translation>顶部:</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <source>Left:</source>
+ <translation>左:</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
+ <source>Reset</source>
+ <translation>重设</translation>
+ </message>
+ <message>
+ <location line="-50"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Right:</source>
+ <translation>右:</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <source>Bottom:</source>
+ <translation>底部:</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
+ <source>Auto Crop</source>
+ <translation>自动剪裁</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>dcaenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>DcaEnc Configuration</source>
+ <translation>DcaEnc 配置</translation>
+ </message>
+</context>
+<context>
+ <name>decimate</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+92"/>
+ <source>Sho_w</source>
+ <translation>慢_慢</translation>
+ </message>
+ <message>
+ <location line="-17"/>
+ <source>Replace (interpolate)</source>
+ <translation>取代 (插入)</translation>
+ </message>
+ <message>
+ <location line="-18"/>
+ <source>Donald Graft decimate. Remove duplicate after telecide.</source>
+ <translation>唐纳德(Donald Graft)抽取，在 telecide 后删除重复。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Decomb decimate</source>
+ <translation>2.5-迪刊谋 迪赛袂(Decomb Decimate)-抽帧去梳理反向PAL视频</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Decomb Decimate</source>
+ <translation>2.5-迪刊谋 迪赛袂(Decomb Decimate)-抽帧去梳理反向PAL视频</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>Medium (full luma, no chroma)</source>
+ <translation>中 (全部的明度，没有色度)</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Discard longer dupe (animés)</source>
+ <translation>丢弃更长的蒙蔽 (animés)</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>T_hreshold 2:</source>
+ <translation>界_限值 2:</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Discard closer</source>
+ <translation>丢弃较靠近的</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Fastest (no chroma, partial luma)</source>
+ <translation>最快 (没有色度，部份的明度)</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>C_ycle:</source>
+ <translation>循_环:</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>_Quality:</source>
+ <translation>_质量:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Threshold 1:</source>
+ <translation>_界限值 1:</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Pulldown dupe removal</source>
+ <translation>去除往下拉蒙蔽</translation>
+ </message>
+</context>
+<context>
+ <name>delogo2</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+41"/>
+ <source>MPlayer delogo2</source>
+ <translation>5.1-去标志2(MPlayer delogo2)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Blend a logo by interpolating its surrounding box.</source>
+ <translation>利用插值它的包围框来混合一个标志。</translation>
+ </message>
+</context>
+<context>
+ <name>dgbob</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
+ <source>Top</source>
+ <translation>顶部</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>DGBob</source>
+ <translation>2.5-浮标过滤器(DGBob)-浮标效果</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>dgbob</source>
+ <translation>2.5-浮标过滤器(DGBob)-浮标效果</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>_Top Field First:</source>
+ <translation>_顶部首先字段</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Double nb of frames and fps</source>
+ <translation>两倍帧和 fps 的数目</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Bottom</source>
+ <translation>底部</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Extra check, avoid using it</source>
+ <translation>额外检查，避免正在使用它</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Double nb of frames (slow motion)</source>
+ <translation>两倍帧的数量(慢运动)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>_Extra</source>
+ <translation>_额外</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Keep nb of frames and fps</source>
+ <translation>保持帧和 fps 的数目</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>_Threshold:</source>
+ <translation>_界限值:</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>Donald Graft Bob.</source>
+ <translation>唐纳德(Donald Graft)Bob.</translation>
+ </message>
+</context>
+<context>
+ <name>dummy</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp" line="+44"/>
+ <source>Dummy</source>
+ <translation>8.1-虚拟</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Null filter, it does nothing at all.</source>
+ <translation>空的过滤器，它没有所有。</translation>
+ </message>
+</context>
+<context>
+ <name>dv</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
+ <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+ <translation>DV 仅支援 720 * 576 * 25 帧/秒和 720 * 480 * 29.97 帧/秒</translation>
+ </message>
+</context>
+<context>
+ <name>encodingDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+398"/>
+ <location line="+31"/>
+ <location line="+48"/>
+ <source>0</source>
+ <translation>0</translation>
+ </message>
+ <message>
+ <location line="-331"/>
+ <source>Low</source>
+ <translation>低</translation>
+ </message>
+ <message>
+ <location line="+187"/>
+ <location line="+7"/>
+ <location line="+14"/>
+ <source>0 MB</source>
+ <translation>0 MB</translation>
+ </message>
+ <message>
+ <location line="-228"/>
+ <source>High</source>
+ <translation>高</translation>
+ </message>
+ <message>
+ <location line="-84"/>
+ <source>Main</source>
+ <translation>主要</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <location line="+180"/>
+ <location line="+21"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Audio Codec:</source>
+ <translation>音频编译码器:</translation>
+ </message>
+ <message>
+ <location line="-142"/>
+ <source>Priority:</source>
+ <translation>优先权:</translation>
+ </message>
+ <message>
+ <location line="+232"/>
+ <source>Video Size:</source>
+ <translation>视频大小:</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Audio Size:</source>
+ <translation>音频大小:</translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <source>Above Normal</source>
+ <translation>高于一般</translation>
+ </message>
+ <message>
+ <location line="+154"/>
+ <source>Video Codec:</source>
+ <translation>视频编译码器:</translation>
+ </message>
+ <message>
+ <location line="-144"/>
+ <source>Below Normal</source>
+ <translation>低于一般</translation>
+ </message>
+ <message>
+ <location line="+322"/>
+ <source>Elapsed:</source>
+ <translation>经过时间:</translation>
+ </message>
+ <message>
+ <location line="-41"/>
+ <source>0 kB/s</source>
+ <translation>0 kB/s</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
+ </message>
+ <message>
+ <location line="-386"/>
+ <source>Time Remaining:</source>
+ <translation>剩余时间:</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Normal</source>
+ <translation>一般</translation>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>Phase:</source>
+ <translation>阶段:</translation>
+ </message>
+ <message>
+ <location line="+338"/>
+ <source>Quantiser:</source>
+ <translation>量化器:</translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <source>Shut down computer when finished</source>
+ <translation>完成后关闭计算器</translation>
+ </message>
+ <message>
+ <location line="+96"/>
+ <source>Pause / Abort</source>
+ <translation>暂停 / 停止</translation>
+ </message>
+ <message>
+ <location line="+200"/>
+ <source>Average Bitrate:</source>
+ <translation>平均比特率(ABR):</translation>
+ </message>
+ <message>
+ <location line="-113"/>
+ <source>Container:</source>
+ <translation>容器:</translation>
+ </message>
+ <message>
+ <location line="-252"/>
+ <source>Encoding...</source>
+ <translation>正在编码...</translation>
+ </message>
+ <message>
+ <location line="+145"/>
+ <source>Minimize to Tray</source>
+ <translation>缩到工具栏上</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Advanced</source>
+ <translation>高级</translation>
+ </message>
+ <message>
+ <location line="+204"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>Frames/sec:</source>
+ <translation>帧/秒:</translation>
+ </message>
+ <message>
+ <location line="-431"/>
+ <location line="+211"/>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+ <message>
+ <location line="+62"/>
+ <source>Total Size:</source>
+ <translation>总大小:</translation>
+ </message>
+</context>
+<context>
+ <name>eq2</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
+ <source>Reset</source>
+ <translation>重新设置</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+65"/>
+ <source>Adjust contrast, brightness, saturation and gamma.</source>
+ <translation>调整对比、亮度、饱和度和伽马射线。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>MPlayer eq2</source>
+ <translation>3.2-综合均衡器MPlayer eq2</translation>
+ </message>
+</context>
+<context>
+ <name>eq2Dialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+201"/>
+ <source>Red</source>
+ <translation>红</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Blue</source>
+ <translation>蓝</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>Green</source>
+ <translation>绿</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Initial</source>
+ <translation>初始</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Weight</source>
+ <translation>加重</translation>
+ </message>
+ <message>
+ <location line="-201"/>
+ <location line="+88"/>
+ <source>Contrast</source>
+ <translation>对比</translation>
+ </message>
+ <message>
+ <location line="-51"/>
+ <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
+ <translation>&lt;b&gt;珈码&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Saturation</source>
+ <translation>饱和度</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Brightness</source>
+ <translation>亮度</translation>
+ </message>
+</context>
+<context>
+ <name>faac</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Faac Configuration</source>
+ <translation>Faac 配置</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>fadeTo</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+ <location line="+23"/>
+ <source>Fade</source>
+ <translation>1.4-淡化效果</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>Fade.</source>
+ <translation>淡化某一段时间效果</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>_End time:</source>
+ <translation>_结束时间:</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>_Start time:</source>
+ <translation>_开始时间:</translation>
+ </message>
+</context>
+<context>
+ <name>fadeToBlack</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+67"/>
+ <source>In</source>
+ <translation>淡入</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Out</source>
+ <translation>淡出</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_开始时间:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_End time:</source>
+ <translation type="unfinished">_结束时间:</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Fade type:</source>
+ <translation>_淡化型式:</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Fade out</source>
+ <translation>淡出</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Fade in</source>
+ <translation>淡入</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <location line="+24"/>
+ <source>Fade to black</source>
+ <translation>1.4-由淡到黑(淡入/淡出)</translation>
+ </message>
+ <message>
+ <location line="-23"/>
+ <source>Fade to black in/out.</source>
+ <translation>由淡到黑 淡入/淡出-某一段时间效果。</translation>
+ </message>
+</context>
+<context>
+ <name>ffmpeg2</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+237"/>
+ <source>Three threads</source>
+ <translation>三个线程</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>KVCD</source>
+ <translation>KVCD</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>_Trellis quantization</source>
+ <translation>_网格量化</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大量化器的_区别：</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>VBV Buffer Size:</source>
+ <translation>VBV 缓冲容量 :</translation>
+ </message>
+ <message>
+ <location line="-29"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_容许误差文件大小 (kb): </translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Field Order:</source>
+ <translation>字段场顺序:</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Quantizer _blur:</source>
+ <translation> 量化器_模糊：</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop(图像群组)大小：</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>Auto (#cpu)</source>
+ <translation>自动 (#cpu)</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Wide (16:9)</source>
+ <translation>宽 (16:9)</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Top Field First</source>
+ <translation>顶部首先字段</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Basic Settings</source>
+ <translation>基本设置</translation>
+ </message>
+ <message>
+ <location line="-60"/>
+ <source>Animes</source>
+ <translation>动画</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
+ </message>
+ <message>
+ <location line="-36"/>
+ <source>Max bitrate (kb/s):</source>
+ <translation>最大比特率 (kb/s):</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>libavcodec MPEG-2 configuration</source>
+ <translation>libavcodec MPEG-2 配置</translation>
+ </message>
+ <message>
+ <location line="-71"/>
+ <source>One thread</source>
+ <translation>一个线程</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>MB comparison</source>
+ <translation>MB 比较</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Progressive</source>
+ <translation>渐进的</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Threading</source>
+ <translation>线程</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>_Number of B frames:</source>
+ <translation> _B 帧的数量:</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Interlacing</source>
+ <translation>交错</translation>
+ </message>
+ <message>
+ <location line="-57"/>
+ <source>Two threads)</source>
+ <translation>两个线程</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>Default</source>
+ <translation>默认</translation>
+ </message>
+ <message>
+ <location line="+66"/>
+ <source>Adv. Settings</source>
+ <translation>Adv. 设置</translation>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>Tmpgenc</source>
+ <translation>Tmpgenc</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Normal (4:3)</source>
+ <translation>正常 (4:3)</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source>Matrices:</source>
+ <translation>矩阵:</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Macroblock decision:</source>
+ <translation>_宏块决定:</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Interlaced</source>
+ <translation>交错</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Bottom Field First</source>
+ <translation>底部首先字段</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器:</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少比特 (vhq)</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Aspect ratio:</source>
+ <translation>像素比例(PAR):</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>_Interlaced:</source>
+ <translation>_交错：</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>_Quantizer compression:</source>
+ <translation>_量化器压缩：</translation>
+ </message>
+</context>
+<context>
+ <name>ffmpeg4</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+208"/>
+ <source>Three threads</source>
+ <translation>三个线程</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>X1</source>
+ <translation>X1</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Log</source>
+ <translation>Log</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>4_MV</source>
+ <translation>4_MV</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <source>EPZS</source>
+ <translation>EPZS</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Full</source>
+ <translation>全部</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>_GMC</source>
+ <translation>_GMC</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>_Trellis quantization</source>
+ <translation>_格子量化</translation>
+ </message>
+ <message>
+ <location line="-30"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Phods</source>
+ <translation>Phods</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大量化器的_区别:</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_过滤大小容许误差</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Quantizer _blur:</source>
+ <translation>量化器_模糊：</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop 大小:</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>Auto (#cpu)</source>
+ <translation>自动 (#cpu)</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>User Interface</source>
+ <translation>用户接口</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>_Quantization type:</source>
+ <translation>_量化型式</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>libavcodec MPEG-4 configuration</source>
+ <translation>libavcodec MPEG-4 配置</translation>
+ </message>
+ <message>
+ <location line="-61"/>
+ <source>One thread</source>
+ <translation>一个线程</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>MB comparison</source>
+ <translation>MB 比较</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Threading</source>
+ <translation>线程</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Matrices</source>
+ <translation>矩阵</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>_Number of B frames:</source>
+ <translation>_B帧的数量</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Two threads)</source>
+ <translation>两个线程</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Motion Estimation</source>
+ <translation>运动估计</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Advanced Simple Profile</source>
+ <translation>高级简单设置檔</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>_Macroblock decision:</source>
+ <translation>_宏块决定</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>_Quarter pixel</source>
+ <translation>_1/4像素</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
+ </message>
+ <message>
+ <location line="-42"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器:</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少比特 (vhq)</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>_Quantizer compression:</source>
+ <translation>_过滤气压缩</translation>
+ </message>
+</context>
+<context>
+ <name>ffmsmpeg4</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+229"/>
+ <source>X1</source>
+ <translation>X1</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Log</source>
+ <translation>Log</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>EPZS</source>
+ <translation>EPZS</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Full</source>
+ <translation>全部</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>_Trellis quantization</source>
+ <translation>_网格量化</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Phods</source>
+ <translation>Phods</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大量化器的_区别</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_容许误差文件大小 (kb):</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Quantizer _blur:</source>
+ <translation>量化_模糊：</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop(图像群组) 大小:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>User Interface</source>
+ <translation>用户接口</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>libavcodec MPEG-4 configuration</source>
+ <translation>libavcodec MPEG-4 配置</translation>
+ </message>
+ <message>
+ <location line="-36"/>
+ <source>MB comparison</source>
+ <translation>MB 比较</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少比特 (vhq)</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>_Quantizer compression:</source>
+ <translation>_量化器压缩:</translation>
+ </message>
+</context>
+<context>
+ <name>ffnvenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+221"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+196"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+222"/>
+ <source>Low Latency</source>
+ <translation>低延迟</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-1"/>
+ <source>BluRay</source>
+ <translation>BluRay蓝光</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+11"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+11"/>
+ <source>Bitrate (kbps):</source>
+ <translation>比特率 (kbps):</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation>比特率 (kbps):</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
+ <source>libavcodec MPEG-4 configuration</source>
+ <translation>libavcodec MPEG-4配置</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="-3"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-2"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-6"/>
+ <source>Preset:</source>
+ <translation>默认定</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>NVENC H.264 configuration</source>
+ <translation>NVENC H.264 配置</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-12"/>
+ <source>Low Quality</source>
+ <translation>低质量</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+ <source>High Quality</source>
+ <translation>高质量</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+17"/>
+ <source>nvEnc HEVC configuration</source>
+ <translation>nvEnc HEVC 配置</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+4"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-13"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
+ <source>Low Latency (HQ)</source>
+ <translation>低延迟 (HQ)</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-1"/>
+ <source>Low Latency (LQ)</source>
+ <translation>低延迟 (LQ)</translation>
+ </message>
+</context>
+<context>
+ <name>ffpsmuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+ <source>Free</source>
+ <translation>自由</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Muxing Format</source>
+ <translation>复合器格式</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Mpeg PS Muxer</source>
+ <translation>Mpeg PS 复合器</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+187"/>
+ <source> video not compatible
+</source>
+ <translation>视频不相容</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source> VCD : only MP2 audio accepted
+</source>
+ <translation>VCD : 仅 MP2 音频被接受</translation>
+ </message>
+ <message>
+ <location line="-23"/>
+ <source> Bad width/height for SVCD
+</source>
+ <translation>不对的宽度/高度为 SVCD</translation>
+ </message>
+ <message>
+ <location line="-60"/>
+ <source>Saving mpeg PS (ff)</source>
+ <translation>保存mpeg PS (ff)</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="-17"/>
+ <source>Allow non compliant stream</source>
+ <translation>容许非相容的流</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>VBV size (kBytes)</source>
+ <translation>VBV 大小 (kBytes)</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+95"/>
+ <source> DVD : only 48 khz audio accepted
+</source>
+ <translation>DVD : 仅 48 khz 音频被接受</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
+</source>
+ <translation>[ffPS] DVD : 仅MP2/AC3/DTS 音频被接受</translation>
+ </message>
+ <message>
+ <location line="-179"/>
+ <source>[Mismatch]</source>
+ <translation>[Mismatch]</translation>
+ </message>
+ <message>
+ <location line="+144"/>
+ <source> Bad width/height for DVD
+</source>
+ <translation>不对的宽度/高度为 DVD</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source> Bad width/height for VCD
+</source>
+ <translation>不对的宽度/高度为 VCD</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+1"/>
+ <source>Advanced</source>
+ <translation>高级</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Video Muxrate (kbits)</source>
+ <translation>视频复合率 (kbits)</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Total Muxrate (kbits)</source>
+ <translation>总复合率 (kbits)</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+34"/>
+ <source> VCD : only 44.1 khz audio accepted
+</source>
+ <translation>VCD : 仅 44.1 khz 音频被接受</translation>
+ </message>
+</context>
+<context>
+ <name>fftsmuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+34"/>
+ <source>TS Muxer</source>
+ <translation>TS 复合器</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Mux rate (MBits/s)</source>
+ <translation>复合率 (MBits/s)</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>VBR muxing</source>
+ <translation>VBR 复合</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+ <source>Saving mpeg TS (ff)</source>
+ <translation>保存 mpeg TS (ff)</translation>
+ </message>
+</context>
+<context>
+ <name>ffvtenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>filesel</name>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+215"/>
+ <source>Cannot write the file</source>
+ <translation>无法写入文件</translation>
+ </message>
+ <message>
+ <location line="-52"/>
+ <source>%s already exists.
+
+Do you want to replace it?</source>
+ <translation>%s 已存在。
+
+你要取代它吗?</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>Cannot open &quot;%s&quot;.</source>
+ <translation>无法开启 &quot;%s&quot;。</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>File error</source>
+ <translation>文件错误</translation>
+ </message>
+ <message>
+ <location line="+65"/>
+ <source>No write access to &quot;%s&quot;.</source>
+ <translation>没有任何写入运动存取到 &quot;%s&quot;。</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <location line="+14"/>
+ <source>It is possible that you are trying to overwrite an input file!</source>
+ <translation>你可能尝试覆写一个输入档!</translation>
+ </message>
+</context>
+<context>
+ <name>flux</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
+ <source>Spatio-temporal cleaner by Ross Thomas.</source>
+ <translation>空间-时间清理器，作者为 Ross Thomas。</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>_Temporal threshold:</source>
+ <translation>_时间界限值:</translation>
+ </message>
+ <message>
+ <location line="-51"/>
+ <location line="+56"/>
+ <source>FluxSmooth</source>
+ <translation>4.3-时空平滑(FluxSmooth)</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>_Spatial threshold:</source>
+ <translation>_空间界限值:</translation>
+ </message>
+</context>
+<context>
+ <name>flv1</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+167"/>
+ <source>X1</source>
+ <translation>X1</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Log</source>
+ <translation>Log</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>EPZS</source>
+ <translation>EPZS</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Full</source>
+ <translation>全部</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>_Trellis quantization</source>
+ <translation>_网格量化:</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Phods</source>
+ <translation>Phods</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大过滤器的_区别:</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_过滤大小容许误差</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Quantizer _blur:</source>
+ <translation>量化器_模糊 :</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop(图像群组) 大小:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>User Interface</source>
+ <translation>用户接口</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>MB comparison</source>
+ <translation>MB 比较</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器:</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>libavcodec FLV1 configuration</source>
+ <translation>libavcodec FLV1 配置</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少位 (vhq)</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>_Quantizer compression:</source>
+ <translation>_量化器压缩：</translation>
+ </message>
+</context>
+<context>
+ <name>flvdemuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+ <source>This FLV file says it has no video.
+I will assume it has and try to continue</source>
+ <translation>这个 FLV 档说它有没有视频。我将假设已并尝试继续</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Warning</source>
+ <translation>警告</translation>
+ </message>
+</context>
+<context>
+ <name>flvmuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp" line="+68"/>
+ <location line="+10"/>
+ <location line="+6"/>
+ <source>Unsupported</source>
+ <translation>未支援的</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Only FLV1 &amp; VP6 supported for video</source>
+ <translation>只支援 FLV1 &amp; VP6 视频编码</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
+ <translation>仅 44.1, 22.050和 11.025 kHz 支援</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Only AAC &amp; mpegaudio supported for audio</source>
+ <translation>仅 AAC &amp; mpeg 音频支援</translation>
+ </message>
+</context>
+<context>
+ <name>gaussian</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+27"/>
+ <source>3x3 convolution filter :gaussian.</source>
+ <translation>3x3高斯卷积过滤器 :(aussian convolution)</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Gaussian convolution.</source>
+ <translation>4.1-高斯卷积(3x3)矩阵-明度色度</translation>
+ </message>
+</context>
+<context>
+ <name>glBenchmark</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
+ <source>OpenGl ReadBack benchmark</source>
+ <translation type="unfinished">7.1-OpenGl 读出基准</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Check how fast readback is.</source>
+ <translation type="unfinished">检查如何快速读出。</translation>
+ </message>
+</context>
+<context>
+ <name>glFragment</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+69"/>
+ <source>Run a fragment shader.</source>
+ <translation type="unfinished">执行片段着色器。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>OpenGl Fragment Shader Sample</source>
+ <translation type="unfinished">7.4- 片段着色器示例 1 (OpenGl)</translation>
+ </message>
+</context>
+<context>
+ <name>glFragment2</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+67"/>
+ <source>Run a fragment shader.</source>
+ <translation type="unfinished">执行片段着色器。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>OpenGl Fragment Shader Sample2</source>
+ <translation type="unfinished">7.4- 片段着色器示例 2 (OpenGl)</translation>
+ </message>
+</context>
+<context>
+ <name>glResize</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+218"/>
+ <source>glResize</source>
+ <translation type="unfinished">g1重设大小</translation>
+ </message>
+ <message>
+ <location line="-152"/>
+ <source>OpenGl Resize</source>
+ <translation type="unfinished">7.2- 重设大小(OpenGl)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Resize using openGl.</source>
+ <translation type="unfinished">重设大小 OpenGl。</translation>
+ </message>
+ <message>
+ <location line="+147"/>
+ <source>Height :</source>
+ <translation type="unfinished">高 :</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Width :</source>
+ <translation type="unfinished">宽 :</translation>
+ </message>
+</context>
+<context>
+ <name>glRotate</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+181"/>
+ <source>glRotate</source>
+ <translation type="unfinished">gl旋转</translation>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>OpenGl Rotate</source>
+ <translation type="unfinished">7.3- 旋转(OpenGl)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rotate image by a small amount.</source>
+ <translation type="unfinished">通过少量的旋转图像。</translation>
+ </message>
+ <message>
+ <location line="+118"/>
+ <source>Angle (°):</source>
+ <translation type="unfinished">角度 (°):</translation>
+ </message>
+</context>
+<context>
+ <name>glSample</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+69"/>
+ <source>Run a fragment shader.</source>
+ <translation type="unfinished">执行片段着色器。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>OpenGl Fragment Shader Sample</source>
+ <translation type="unfinished">7.4-OpenGl 片段着色器示例</translation>
+ </message>
+</context>
+<context>
+ <name>glShader</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+15"/>
+ <source>ShaderLoader</source>
+ <translation type="unfinished">7.8-着色器载入(OpenGl)</translation>
+ </message>
+ <message>
+ <location line="-196"/>
+ <source>Run an external shader program.</source>
+ <translation type="unfinished">执行外部着色器程序。</translation>
+ </message>
+ <message>
+ <location line="+192"/>
+ <source>ShaderFile to load</source>
+ <translation type="unfinished">着色档要载入</translation>
+ </message>
+ <message>
+ <location line="-193"/>
+ <source>Shader Loader</source>
+ <translation type="unfinished">7.6-载入着色器</translation>
+ </message>
+</context>
+<context>
+ <name>glSmooth</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp" line="+61"/>
+ <source>OpenGl Smooth</source>
+ <translation type="unfinished">7.7- 光滑(OpenGl)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Smooth image while preserving edge.</source>
+ <translation type="unfinished">同时保留边缘平滑的图像。</translation>
+ </message>
+</context>
+<context>
+ <name>glVdpaufilter</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+276"/>
+ <source>vdpau</source>
+ <translation type="unfinished">vdpau</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>_Deint Mode:</source>
+ <translation type="unfinished">_去交错模式：</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>_Resize:</source>
+ <translation type="unfinished">_重设大小</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Keep Top Field</source>
+ <translation type="unfinished">保持顶部字段场</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Keep Bottom Field</source>
+ <translation type="unfinished">保持底部字段场</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Height :</source>
+ <translation type="unfinished">高</translation>
+ </message>
+ <message>
+ <location line="-187"/>
+ <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
+ <translation type="unfinished">VDPAU 去交错化 + 重设大小，openGl 版本 （更快）。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>vdpauDeintGl</source>
+ <translation type="unfinished">7.8-vdpauDeintGl</translation>
+ </message>
+ <message>
+ <location line="+187"/>
+ <source>Width :</source>
+ <translation type="unfinished">宽</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Double framerate</source>
+ <translation type="unfinished">双倍帧率</translation>
+ </message>
+</context>
+<context>
+ <name>glVertex</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+60"/>
+ <source>Run a simple vertex shader.</source>
+ <translation type="unfinished">执行一个简单的顶点着色器。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>OpenGl Vertex Shader</source>
+ <translation type="unfinished">7.6- 顶点着色器(OpenGl)</translation>
+ </message>
+</context>
+<context>
+ <name>glWave</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp" line="+60"/>
+ <source>Simple wave filter.</source>
+ <translation type="unfinished">简单波纹效果</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>OpenGl wave </source>
+ <translation type="unfinished">7.2- 波纹效果(OpenGl)</translation>
+ </message>
+</context>
+<context>
+ <name>glYadif</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+275"/>
+ <source>yadif</source>
+ <translation type="unfinished">2.1-亚迪夫(yadif)过滤器</translation>
+ </message>
+ <message>
+ <location line="-197"/>
+ <source>Yet another deinterlacer, using shaders.</source>
+ <translation type="unfinished">然而另一个去交错化，使用着色器。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Yadif (openGl)</source>
+ <translation type="unfinished">7.1-亚迪夫(yadif) (openGl)</translation>
+ </message>
+ <message>
+ <location line="+190"/>
+ <source>Top field first</source>
+ <translation type="unfinished">顶部首先字段</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>_Order:</source>
+ <translation type="unfinished">_顺序:</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>_Mode:</source>
+ <translation type="unfinished">_模式:</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Temporal &amp; spatial check</source>
+ <translation type="unfinished">时间 &amp; 空间的检查</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bob, temporal &amp; spatial check</source>
+ <translation type="unfinished">振动，时间 &amp; 空间检查</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Bob, skip spatial temporal check</source>
+ <translation type="unfinished">振动，略过时间空间检查</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Skip spatial temporal check</source>
+ <translation type="unfinished">略过时间空间检查</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Bottom field first</source>
+ <translation type="unfinished">底部首先字段</translation>
+ </message>
+</context>
+<context>
+ <name>hflip</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+45"/>
+ <source>Horizontally flip the image.</source>
+ <translation>水平翻转图像-对Y轴翻转</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Horizontal Flip</source>
+ <translation>1.1-左右颠倒</translation>
+ </message>
+</context>
+<context>
+ <name>histogram</name>
+ <message>
+ <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+220"/>
+ <source>Bitrate Histogram</source>
+ <translation>比特率分布图</translation>
+ </message>
+ <message>
+ <location line="-18"/>
+ <source>Max. bitrate:</source>
+ <translation>最大比特率:</translation>
+ </message>
+ <message>
+ <location line="-146"/>
+ <location line="+75"/>
+ <source>No data</source>
+ <translation>没有资料</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>Max. B frames:</source>
+ <translation>最大 B 帧数:</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Average bitrate:</source>
+ <translation>平均比特率(ABR):</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Number of P frames:</source>
+ <translation>P 帧数目:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Number of B frames:</source>
+ <translation>B 帧数目:</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Number of I frames:</source>
+ <translation>I 帧数目:</translation>
+ </message>
+</context>
+<context>
+ <name>hue</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
+ <source>Adjust hue and saturation.</source>
+ <translation>调整色相和饱和度。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Mplayer Hue</source>
+ <translation>3.2-Mplayer Hue(色阶)</translation>
+ </message>
+</context>
+<context>
+ <name>hueDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui" line="+14"/>
+ <location line="+45"/>
+ <source>Hue</source>
+ <translation>色阶</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Saturation</source>
+ <translation>饱和度</translation>
+ </message>
+</context>
+<context>
+ <name>huff</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+114"/>
+ <source>Type:</source>
+ <translation>型:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>HuffYUV Configuration</source>
+ <translation>HuffYUV配置</translation>
+ </message>
+ <message>
+ <location line="-13"/>
+ <source>HUFFYUV</source>
+ <translation>HUFFYUV</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>FF HUFFYUV</source>
+ <translation>FF HUFFYUV</translation>
+ </message>
+</context>
+<context>
+ <name>hzstackfield</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
+ <source>Horizontal Stack Fields</source>
+ <translation>2.8-水平堆栈字段场-左右并排</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Put fields side by side.</source>
+ <translation>字段场并排，是用来看看一些并排情况，如需改进。</translation>
+ </message>
+</context>
+<context>
+ <name>indexing</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+17"/>
+ <source>Do you want to abort indexing ?</source>
+ <translation>你想要中止索引吗？</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Continue indexing</source>
+ <translation>继续编制索引</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>Time Left :%02d:%02d:%02d</source>
+ <translation>剩余时间：%02d:%02d:%02d</translation>
+ </message>
+ <message>
+ <location line="-76"/>
+ <source>Abort Requested</source>
+ <translation>中止请求</translation>
+ </message>
+</context>
+<context>
+ <name>ivtcRemover</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+142"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+431"/>
+ <source>Fast</source>
+ <translation>快</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-1"/>
+ <source>Full</source>
+ <translation>全部</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-5"/>
+ <source>_Noise:</source>
+ <translation>_噪声:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+ <source>_Show:</source>
+ <translation>_慢慢</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Remove duplicate:</source>
+ <translation>_删除重复：</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+14"/>
+ <source>DupeRemover</source>
+ <translation>删除重复的帧</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-349"/>
+ <source>Remove IVTC dupe.</source>
+ <translation>2.6-删除重复的帧(IVTC)。</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-8"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+341"/>
+ <source>VeryFast</source>
+ <translation>非常快</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+ <source>_Frame rate change:</source>
+ <translation>_帧率改变:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-345"/>
+ <source>Remove the duplicate frames present after ivtc.</source>
+ <translation>删除重复的帧(IVTC)和PAL智能型一样</translation>
+ </message>
+</context>
+<context>
+ <name>jobs</name>
+ <message>
+ <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+ <source>Oops</source>
+ <translation>Oops</translation>
+ </message>
+ <message>
+ <location filename="../ADM_jobs/src/uiJobs.ui" line="+71"/>
+ <source>Quit</source>
+ <translation>离开</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>Delete already executed jobs</source>
+ <translation>删除以执行的工作</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Avidemux Jobs</source>
+ <translation>Avidemux工作</translation>
+ </message>
+ <message>
+ <location filename="../../common/GUI_jobs.cpp" line="+6"/>
+ <source>There are no jobs stored</source>
+ <translation>没有保存任何工作</translation>
+ </message>
+ <message>
+ <location filename="../ADM_jobs/src/uiJobs.ui" line="+24"/>
+ <source>Cleanup</source>
+ <translation>清理</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>use Qt version</source>
+ <translation>使用 Qt 版本</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Run jobs</source>
+ <translation>执行工作</translation>
+ </message>
+ <message>
+ <location filename="../../common/GUI_jobs.cpp" line="-6"/>
+ <source>Something very wrong happened when building joblist.</source>
+ <translation>建立任务栏表时发生某些重大错误。</translation>
+ </message>
+ <message>
+ <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
+ <source>If you use VDPAU you cannot use CLI version</source>
+ <translation>如果你使用 VDPAU 你不能使用 CLI 版本</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Run all pending jobs</source>
+ <translation>运行所有挂起的作业</translation>
+ </message>
+</context>
+<context>
+ <name>jobsDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
+ <source>Jobs</source>
+ <translation>工作</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Delete All Jobs</source>
+ <translation>删除所有工作</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Run All Jobs</source>
+ <translation>执行所有工作</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Delete Sel. Job</source>
+ <translation>删除选择的工作</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Run Selected Job</source>
+ <translation>执行选择的工作</translation>
+ </message>
+</context>
+<context>
+ <name>jpeg</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+96"/>
+ <source>_ColorSpace:</source>
+ <translation>_色彩空间：</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Mjpeg Configuration</source>
+ <translation>Mjpeg 配置</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>_Quantizer:</source>
+ <translation>_量化器:</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>YUV420</source>
+ <translation>YUV420</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>YUV422</source>
+ <translation>YUV422</translation>
+ </message>
+</context>
+<context>
+ <name>kerneldeint</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="+65"/>
+ <source>Top</source>
+ <translation>顶部</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>_Map</source>
+ <translation>_网图</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Extrapolate better (better not to use it)</source>
+ <translation>推算较好的 (最好不使用它)</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Smaller means more deinterlacing</source>
+ <translation>越小表示更多的去交错</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Bottom</source>
+ <translation>底部</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>_Sharper engine:</source>
+ <translation>_清晰化引擎:</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>Kernel Deint.</source>
+ <translation>2.2-内核去交错(KernelDeint)-去尖锐网图</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Port of Donald Graft Kernel Deinterlacer.</source>
+ <translation>唐纳德(Donald Graft)的内核去交错器端口</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>_Sharp</source>
+ <translation>_锐利</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Field order:</source>
+ <translation>_字段场顺序</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>T_woway</source>
+ <translation>双_向</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>KernelDeint</source>
+ <translation>2.2-内核去交错(KernelDeint)-去尖锐网图</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>_Threshold:</source>
+ <translation>_界限值:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show interlaced areas (for test!)</source>
+ <translation>显示交错的范围(测试用！)</translation>
+ </message>
+</context>
+<context>
+ <name>lame</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+311"/>
+ <source>ABR</source>
+ <translation>ABR</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>CBR</source>
+ <translation>CBR</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率:</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>LAME Configuration</source>
+ <translation>LAME 配置</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Bit_rate mode:</source>
+ <translation>比特_率模式:</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>_Quality:</source>
+ <translation>_质量:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>_Disable reservoir:</source>
+ <translation>_禁用贮存</translation>
+ </message>
+</context>
+<context>
+ <name>largemedian</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+36"/>
+ <source>Large Median (5x5).</source>
+ <translation>4.1-大中位数卷积(5x5)矩阵-明度色度。</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Fast Convolution</source>
+ <translation>快速卷积</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Process luma plane</source>
+ <translation>处理明度平面</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>_Process luma</source>
+ <translation>_处理明度</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <source>Median filter on 5x5 matrix.</source>
+ <translation>5 x 5 矩阵的中值过滤。</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>P_rocess chroma</source>
+ <translation>处_理色度</translation>
+ </message>
+</context>
+<context>
+ <name>lavcodec</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率:</translation>
+ </message>
+</context>
+<context>
+ <name>lavdecoder</name>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
+ <source>_Swap U and V</source>
+ <translation>_U和V交换色彩</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show motion _vectors</source>
+ <translation>显示向量_运动</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Decoder Options</source>
+ <translation>译码器选项</translation>
+ </message>
+</context>
+<context>
+ <name>lavdeint</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+188"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="-116"/>
+ <source>Lavcodec deinterlacer family.</source>
+ <translation>libav编解碼去交错过滤家族</translation>
+ </message>
+ <message>
+ <location line="+117"/>
+ <source>Linear blend</source>
+ <translation>线性混合</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>libavcodec deinterlacer</source>
+ <translation>2.3-立巴扣迭克(libavcodec)-各种插值自动色阶</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Linear interpolate</source>
+ <translation>线性插值</translation>
+ </message>
+ <message>
+ <location line="-119"/>
+ <source>Libavdec Deinterlacers</source>
+ <translation>2.3-立巴扣迭克(libavcodec)-各种插值自动色阶</translation>
+ </message>
+ <message>
+ <location line="+127"/>
+ <source>_Autolevel</source>
+ <translation>_自动色阶</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Median interpolate</source>
+ <translation>中位插值</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Cubic interpolate</source>
+ <translation>立方插值</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>FFmpeg deint</source>
+ <translation>FFmpeg 去交错</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>_Deinterlacing:</source>
+ <translation>_去交错:</translation>
+ </message>
+</context>
+<context>
+ <name>licenseDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+62"/>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>License</source>
+ <translation>授权</translation>
+ </message>
+</context>
+<context>
+ <name>logo</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+23"/>
+ <source>Put a logo on top of video, with alpha blending.</source>
+ <translation>把标志上方带有 alpha(半)混合视频</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Add logo</source>
+ <translation>1.0-加入标志-汇入logo图片</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
+ <source>Select Logo Image</source>
+ <translation>选择标志图像</translation>
+ </message>
+ <message>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>logoDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+64"/>
+ <source>X</source>
+ <translation>X</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Y</source>
+ <translation>Y</translation>
+ </message>
+ <message>
+ <location line="-67"/>
+ <source>Logo</source>
+ <translation>标志</translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Alpha</source>
+ <translation>Alpha透明</translation>
+ </message>
+ <message>
+ <location line="-77"/>
+ <location line="+7"/>
+ <source>Image</source>
+ <translation>图像</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Select</source>
+ <translation>选择</translation>
+ </message>
+ <message>
+ <location line="+83"/>
+ <source>Fade-in/out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
+ <translation>您可以单击图像去设置近似的标志</translation>
+ </message>
+ <message>
+ <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <translation type="vanished">如果图像 Alpha 色板 (RGB 的 png)，Alpha 将被忽略</translation>
+ </message>
+</context>
+<context>
+ <name>lumaonly</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
+ <source>GreyScale</source>
+ <translation>3.1-GreyScale(灰阶)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Remove color, only key grey image.</source>
+ <translation>删除颜色，只保留关键灰色度图像</translation>
+ </message>
+</context>
+<context>
+ <name>mainFilterDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+227"/>
+ <source>Noise</source>
+ <translation>噪声-清除</translation>
+ </message>
+ <message>
+ <location line="-146"/>
+ <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
+ <translation>&lt;big&gt;&lt;b&gt;选用的过滤器&lt;/b&gt;&lt;/big&gt;</translation>
+ </message>
+ <message>
+ <location line="+244"/>
+ <source>&amp;Close</source>
+ <translation>&amp;关闭</translation>
+ </message>
+ <message>
+ <location line="-305"/>
+ <source>Video Filter Manager</source>
+ <translation>视频过滤管理器</translation>
+ </message>
+ <message>
+ <location line="+198"/>
+ <source>Colors</source>
+ <translation>色彩-特效</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>OpenGl</source>
+ <translation>OpenGl</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Miscellaneous</source>
+ <translation>杂项</translation>
+ </message>
+ <message>
+ <location line="+51"/>
+ <source>&amp;Preview</source>
+ <translation>&amp;预览</translation>
+ </message>
+ <message>
+ <location line="-114"/>
+ <source>Transform</source>
+ <translation>变形(转型)</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Sharpness</source>
+ <translation>锐利-特效</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Interlacing</source>
+ <translation>交错(隔行)字段</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Subtitles</source>
+ <translation>字幕-汇入文本檔</translation>
+ </message>
+ <message>
+ <location line="-86"/>
+ <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
+ <translation>&lt;big&gt;&lt;b&gt;可选用的过滤器&lt;/b&gt;&lt;/big&gt;</translation>
+ </message>
+</context>
+<context>
+ <name>matroskademuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+474"/>
+ <source>Matroska clusters</source>
+ <translation>Matroska 集群</translation>
+ </message>
+ <message>
+ <location line="-426"/>
+ <source>Matroska Images</source>
+ <translation>Matroska 图像</translation>
+ </message>
+</context>
+<context>
+ <name>mcdeint</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+120"/>
+ <source>Fast</source>
+ <translation>快</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>_Qp:</source>
+ <translation>_Qp:</translation>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>MCDeint</source>
+ <translation>MC去交错</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Extra slow (same as 3+multiple reference frames)</source>
+ <translation>特别慢 (同于3或3倍数以上的参考帧数)</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Slow iterative motion search</source>
+ <translation>缓慢反复的运动搜寻</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Medium</source>
+ <translation>中</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bottom :</source>
+ <translation>底部 :</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>mcDeinterlace</source>
+ <translation>mc去交错</translation>
+ </message>
+ <message>
+ <location line="-50"/>
+ <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
+ <translation>从 MPlayer 移植的运动补偿去交错器。</translation>
+ </message>
+</context>
+<context>
+ <name>mean</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
+ <source>Mean convolution.</source>
+ <translation>4.1-Mean 卷积(3x3)矩阵-明度色度。</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>3x3 convolution filter :mean.</source>
+ <translation>3 x 3 卷积过滤：mean(convolution)</translation>
+ </message>
+</context>
+<context>
+ <name>median</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+29"/>
+ <source>3x3 convolution filter :median.</source>
+ <translation>3 x 3 卷积过滤： 中位数。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Median convolution.</source>
+ <translation>4.1-中位数卷积(3x3)矩阵-明度色度。</translation>
+ </message>
+</context>
+<context>
+ <name>mergeFields</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
+ <source>Merge Fields</source>
+ <translation>2.7-视频合并字段场左右挤压，画面在垂直中带</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Merge two pictures as if they were two fields.</source>
+ <translation>图像和双垂直分辨率减半。</translation>
+ </message>
+</context>
+<context>
+ <name>mkvmuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
+ <source>Saving Mkv</source>
+ <translation>保存 Mkv中</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+30"/>
+ <source>Display width</source>
+ <translation>显示宽度</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Force display width</source>
+ <translation>限制显示宽度</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>MKV Muxer</source>
+ <translation>MKV 复合器</translation>
+ </message>
+</context>
+<context>
+ <name>mp3d</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+237"/>
+ <source>T_emporal chroma strength:</source>
+ <translation>时_间色度强度：</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+ <translation>降低噪声、平滑图像、增加可压缩性，HQ的版本。</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>S_patial chroma strength:</source>
+ <translation>空_间的色度强度:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Temporal luma strength:</source>
+ <translation>_时间明度强度：</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Spatial luma strength:</source>
+ <translation>_空间的明度强度:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>MPlayer Denoise 3D HQ</source>
+ <translation>4.2-MPlayer高精度质量时空去噪声3D HQ</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>Mplayer Denoise 3D HQ</source>
+ <translation>4.2-MPlayer高精度质量时空去噪声3D HQ</translation>
+ </message>
+</context>
+<context>
+ <name>mp3dlow</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="+70"/>
+ <source>S_patial chroma strength:</source>
+ <translation>空_间的色度强度:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Temporal strength:</source>
+ <translation>_时间强度:</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Spatial luma strength:</source>
+ <translation>_空间的明度强度:</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>Mplayer Denoise 3D</source>
+ <translation>4.2-MPlayer时空去噪声3D</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Reduce noise, smooth image, increase compressibility.</source>
+ <translation>减少噪声、平滑图像、增加压缩率。</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>MPlayer Denoise 3D</source>
+ <translation>4.2-MPlayer时空去噪声3D</translation>
+ </message>
+</context>
+<context>
+ <name>mp4demuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
+ <source>Problem reading SVQ3 headers</source>
+ <translation>读取 SVQ3 档头时发生问题</translation>
+ </message>
+</context>
+<context>
+ <name>mp4muxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
+ <source>Muxing Format</source>
+ <translation>复合器格式</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+188"/>
+ <source>Saving PSP</source>
+ <translation>保存 PSP</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Saving mp4</source>
+ <translation>保存 mp4</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="-3"/>
+ <source>Use alternate MP3 tag</source>
+ <translation>使用备用的 MP3 标记</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-121"/>
+ <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="+6"/>
+ <source>MP4 Muxer</source>
+ <translatorcomment>Force aspect ratio &amp; DAR NO Display</translatorcomment>
+ <translation type="unfinished">强制PA&amp;R不显示</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+0"/>
+ <location line="+9"/>
+ <source>Unsupported</source>
+ <translation>未支援的</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+ <translation>只有 AAC、 AC3、 E AC3 和mpeg音频支援音频</translation>
+ </message>
+</context>
+<context>
+ <name>mp4v2muxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+ <source>Audio</source>
+ <translation>音频</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>Video</source>
+ <translation>视频</translation>
+ </message>
+ <message>
+ <location line="-60"/>
+ <source>Audio format not supported, only AAC/MP3/AC3</source>
+ <translation>音频格式不受支持，只有 AAC/MP3/AC3</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+133"/>
+ <source>Cannot get AAC Extra data
+</source>
+ <translation>不能获取 AAC 额外数据</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+46"/>
+ <source>Saving</source>
+ <translation>保存中</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Video does not have enough timing information. Are you copying from AVI?</source>
+ <translation>视频没有足够的时间信息。你将从 AVI 复制吗？</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="-61"/>
+ <source>Invalid bitrate for AC3</source>
+ <translation>AC3不正确比特速率</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
+ <translation>无效的频率AC3只有 32, 44.1 &amp; 48 kHz</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+65"/>
+ <source>Cannot rename file (optimize)</source>
+ <translation>无法重命名档（优化）</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+32"/>
+ <source>Invalid number of channels for AC3</source>
+ <translation>AC3 音频的数目无效</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
+ <source>Optimize for streaming (SLOW)</source>
+ <translation>优化的音频（慢）</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add ipod metadata</source>
+ <translation>增加 ipod 元数据</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>MP4V2 Settings</source>
+ <translation>MP4V2 设置</translation>
+ </message>
+</context>
+<context>
+ <name>mpdelogoDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+22"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+46"/>
+ <source>X</source>
+ <translation>X</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+37"/>
+ <source>Y</source>
+ <translation>Y</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-17"/>
+ <source>Width</source>
+ <translation>宽</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-7"/>
+ <source>Border Width</source>
+ <translation>边框宽度</translation>
+ </message>
+ <message>
+ <location line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-45"/>
+ <source>Mplayer Delogo</source>
+ <translation>5.1-去标志(MPlayer delogo)</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+59"/>
+ <source>Height</source>
+ <translation>高</translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>Preview. Click in the image above to coarsly set the box coordinates</source>
+ <translation>预览，在上述粗设置框坐标图像中单击光标</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+103"/>
+ <source>Preview</source>
+ <translation>预览</translation>
+ </message>
+ <message>
+ <location line="-58"/>
+ <source>You can resize the red rectangle using the grips </source>
+ <translation>你可以重设大小使用支配的红色矩形</translation>
+ </message>
+</context>
+<context>
+ <name>msharpen</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
+ <source>Msharpen</source>
+ <translation>5.2-运动锐化(Msharpen)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
+ <translation>没有放大噪声下锐利化边缘。作者为 唐纳德(Donald Graft)。</translation>
+ </message>
+</context>
+<context>
+ <name>msharpenDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+77"/>
+ <source>Mask</source>
+ <translation>掩码</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Threshold</source>
+ <translation>界限值</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>HighQuality</source>
+ <translation>高质量</translation>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>MSharpen</source>
+ <translation>5.2-运动锐化(Msharpen)</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Strength</source>
+ <translation>强度</translation>
+ </message>
+</context>
+<context>
+ <name>navigate</name>
+ <message>
+ <location filename="../../common/gui_navigate.cpp" line="+501"/>
+ <source>Seek</source>
+ <translation>寻求</translation>
+ </message>
+ <message>
+ <location line="+78"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location line="-266"/>
+ <source>Cannot go to previous keyframe</source>
+ <translation>转到上一帧(关键帧或I帧)</translation>
+ </message>
+ <message>
+ <location line="-69"/>
+ <source>Cannot go to next keyframe</source>
+ <translation>转到下一帧(关键帧或I帧)</translation>
+ </message>
+</context>
+<context>
+ <name>nvenc</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+154"/>
+ <source>Nvidia H264 Encoder configuration</source>
+ <translation>Nvidia H264 编码器配置</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Low Latency</source>
+ <translation>低延迟</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>BluRay</source>
+ <translation>BluRay蓝光</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Bitrate (kbps):</source>
+ <translation>比特速率 (kbps):</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation>最大比特率 (kbps):</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Preset:</source>
+ <translation>默认定 :</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Low Quality</source>
+ <translation>低质量</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>High Quality</source>
+ <translation>高质量</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Low Latency (HQ)</source>
+ <translation>低延迟 (HQ)</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Low Latency (LQ)</source>
+ <translation>低延迟 (LQ)</translation>
+ </message>
+</context>
+<context>
+ <name>opendmldemuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+ <location line="+76"/>
+ <location line="+268"/>
+ <source>Malformed header</source>
+ <translation>不正常的标头</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <source>Unpacking bitstream</source>
+ <translation>解压比特流</translation>
+ </message>
+</context>
+<context>
+ <name>partial</name>
+ <message>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+344"/>
+ <source>_End time:</source>
+ <translation>结束时间:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Configure filter</source>
+ <translation>配置过滤器</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Partial Filter</source>
+ <translation>局部过滤器</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>_Start time:</source>
+ <translation>开始时间:</translation>
+ </message>
+</context>
+<context>
+ <name>printinfo</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
+ <source>PrintInfo</source>
+ <translation>8.2-打印信息</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Display some informations on Screen.</source>
+ <translation>显示一些信息在屏幕上</translation>
+ </message>
+</context>
+<context>
+ <name>propsDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+311"/>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <location line="-142"/>
+ <source>Audio</source>
+ <translation>音频</translation>
+ </message>
+ <message>
+ <location line="-149"/>
+ <source>Video</source>
+ <translation>视频</translation>
+ </message>
+ <message>
+ <location line="+222"/>
+ <source>Bitrate:</source>
+ <translation>比特率:</translation>
+ </message>
+ <message>
+ <location line="-83"/>
+ <source>Extra data :</source>
+ <translation>额外的数据</translation>
+ </message>
+ <message>
+ <location line="-42"/>
+ <source>Extra Video Properties</source>
+ <translation>额外的视频属性</translation>
+ </message>
+ <message>
+ <location line="-52"/>
+ <location line="+135"/>
+ <source>Total Duration:</source>
+ <translation>总持续时间:</translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>Codec:</source>
+ <translation>编译码器:</translation>
+ </message>
+ <message>
+ <location line="-125"/>
+ <source>ExtraDataSize:</source>
+ <translation>额外的数据大小：</translation>
+ </message>
+ <message>
+ <location line="-131"/>
+ <source>Properties</source>
+ <translation>属性</translation>
+ </message>
+ <message>
+ <location line="+79"/>
+ <source>Image Size:</source>
+ <translation>图像大小(DAR):</translation>
+ </message>
+ <message>
+ <location line="-42"/>
+ <source>Frame Rate:</source>
+ <translation>帧率:</translation>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Variable Bitrate:</source>
+ <translation>可变比特率(VBR):</translation>
+ </message>
+ <message>
+ <location line="+61"/>
+ <source>Copy to Clipboard</source>
+ <translation>复制到剪贴簿</translation>
+ </message>
+ <message>
+ <location line="-26"/>
+ <source>Channels:</source>
+ <translation>声道:</translation>
+ </message>
+ <message>
+ <location line="-49"/>
+ <source>Frequency:</source>
+ <translation>频率:</translation>
+ </message>
+ <message>
+ <location line="-100"/>
+ <source>Codec 4CC:</source>
+ <translation>编译码器 4CC:</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Aspect Ratio:</source>
+ <translation>像素比例(PAR):</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <location line="+14"/>
+ <location line="+14"/>
+ <location line="+14"/>
+ <location line="+14"/>
+ <source>TextLabel</source>
+ <translation>文本标签</translation>
+ </message>
+</context>
+<context>
+ <name>psdemuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+ <source>Indexing</source>
+ <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>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+41"/>
+ <source>There are several files with sequential file names. Should they be all loaded ?</source>
+ <translation>有几个文件使用顺序文件名称，所有加载他们吗？</translation>
+ </message>
+</context>
+<context>
+ <name>qaudiotracks</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+510"/>
+ <source>copy</source>
+ <translation>复制</translation>
+ </message>
+ <message>
+ <location line="-354"/>
+ <location line="+152"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location line="+134"/>
+ <source>File </source>
+ <translation>文件 </translation>
+ </message>
+ <message>
+ <location line="-134"/>
+ <source>Some tracks are used multiple times</source>
+ <translation>一些轨道使用多次</translation>
+ </message>
+ <message>
+ <location line="+126"/>
+ <source>Track </source>
+ <translation>轨 </translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>.... Add audio track</source>
+ <translation>....增加音频轨</translation>
+ </message>
+ <message>
+ <location line="-342"/>
+ <source>Select audio file</source>
+ <translation>将选择音频文件</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Cannot use that file as audio track</source>
+ <translation>不能使用该档作为音频轨道</translation>
+ </message>
+ <message>
+ <location line="+278"/>
+ <source> from video</source>
+ <translation>来至视频</translation>
+ </message>
+</context>
+<context>
+ <name>qencoding</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+378"/>
+ <source>Abort</source>
+ <translation>中止</translation>
+ </message>
+ <message>
+ <location line="-313"/>
+ <location line="+20"/>
+ <source>Privileges Required</source>
+ <translation>需要特殊权限</translation>
+ </message>
+ <message>
+ <location line="+101"/>
+ <source>Pass 1</source>
+ <translation>通过 1</translation>
+ </message>
+ <message>
+ <location line="+192"/>
+ <source>Resume</source>
+ <translation>继续</translation>
+ </message>
+ <message>
+ <location line="-313"/>
+ <location line="+20"/>
+ <source>Root privileges are required to perform this operation.</source>
+ <translation>需要 Root 权限来实行这项操作。</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>First Pass</source>
+ <translation>快速第1通</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Encoding...</source>
+ <translation>编码中..</translation>
+ </message>
+ <message>
+ <location line="+188"/>
+ <source>The encoding is paused. Do you want to resume or abort?</source>
+ <translation>编码已经暂停。您要继续或中止?</translation>
+ </message>
+</context>
+<context>
+ <name>qfile</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+135"/>
+ <location line="+96"/>
+ <source> files (*.</source>
+ <translation> 文件 (*.</translation>
+ </message>
+ <message>
+ <location line="-181"/>
+ <location line="+139"/>
+ <source>All files (*.*)</source>
+ <translation>所有文件 (*.*)</translation>
+ </message>
+ <message>
+ <location line="-26"/>
+ <source>Overwrite file </source>
+ <translation>覆写文件</translation>
+ </message>
+</context>
+<context>
+ <name>qgui2</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2033"/>
+ <source>%c-%s (%02d)</source>
+ <translation>%c-%s (%02d)</translation>
+ </message>
+ <message>
+ <location line="-915"/>
+ <source>Set start marker</source>
+ <translation>设置开始标记</translation>
+ </message>
+ <message>
+ <location line="-907"/>
+ <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>
+ <message>
+ <location line="+246"/>
+ <source>Recent Projects</source>
+ <translation>最近使用的 项目</translation>
+ </message>
+ <message>
+ <location line="+655"/>
+ <source>Go to previous keyframe</source>
+ <translation>转到上一帧(关键帧或I帧)</translation>
+ </message>
+ <message>
+ <location line="-656"/>
+ <source>Recent Files</source>
+ <translation>最近使用的 文件</translation>
+ </message>
+ <message>
+ <location line="+659"/>
+ <source>Go to next keyframe</source>
+ <translation>转到下一帧(关键帧或I帧)</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Backward one minute</source>
+ <translation>倒退一分钟</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Go to first frame</source>
+ <translation>转到第一帧</translation>
+ </message>
+ <message>
+ <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="vanished">&lt;b&gt;有效新版本&lt;/b&gt;&lt;br&gt; 版本 %1&lt;br&gt;
+ 上发行 %2.&lt;br&gt;在这里你能下载它&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;
+ %3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; 您可以启用自动更新在选项。&lt;
+ /small&gt;</translation>
+ </message>
+ <message>
+ <location line="-23"/>
+ <source>Play/Stop</source>
+ <translation>播放/停止</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Go to marker A</source>
+ <translation>转到标记A(选择开始)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Go to marker B</source>
+ <translation>转到标记B(选择结束)</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Set end marker</source>
+ <translation>设置结束标记</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Forward one minute</source>
+ <translation>前进一分钟</translation>
+ </message>
+ <message>
+ <location line="-48"/>
+ <source>Go to previous frame</source>
+ <translation>转到上一帧</translation>
+ </message>
+ <message>
+ <location line="+665"/>
+ <source>The application has encountered a fatal problem
+The current editing has been saved and will be reloaded at next start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+596"/>
+ <source> (%d track(s))</source>
+ <translation> (%d 轨(s))</translation>
+ </message>
+ <message>
+ <location line="-1258"/>
+ <source>Go to next frame</source>
+ <translation>转到下一帧</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Go to last frame</source>
+ <translation>转到最后一帧</translation>
+ </message>
+</context>
+<context>
+ <name>qgui2menu</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+91"/>
+ <source>Scripting Shell</source>
+ <translation>脚本壳(Shell)</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Save &amp;As Project...</source>
+ <translation>保存 &amp; 另存项目...</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source> Shell</source>
+ <translation>壳(Shell)</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source> Project</source>
+ <translation>项目</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Debug Project...</source>
+ <translation>&amp;调试项目...</translation>
+ </message>
+ <message>
+ <location line="+51"/>
+ <source>Scripting Reference</source>
+ <translation>参考脚本</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>&amp;Run Project...</source>
+ <translation>&amp;执行项目...</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source> Reference</source>
+ <translation>参考</translation>
+ </message>
+ <message>
+ <location line="-70"/>
+ <source>Project Script</source>
+ <translation>项目脚本</translation>
+ </message>
+</context>
+<context>
+ <name>qjobs</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
+ <source>Ready</source>
+ <translation>准备</translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <location line="+14"/>
+ <source>Sure!</source>
+ <translation>确定!</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you want to delete ALL jobs?</source>
+ <translation>确定要删除所有工作?</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>End Time</source>
+ <translation>终了时间</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Failed</source>
+ <translation>已失败</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Job Name</source>
+ <translation>工作名称</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Status</source>
+ <translation>状态</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Start Time</source>
+ <translation>起始时间</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Succeeded</source>
+ <translation>已成功</translation>
+ </message>
+ <message>
+ <location line="+126"/>
+ <source>This script has already been successfully executed.</source>
+ <translation>这个脚本已经成功执行。</translation>
+ </message>
+ <message>
+ <location line="-126"/>
+ <source>Running</source>
+ <translation>正在执行</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deleted</source>
+ <translation>已删除</translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <source>Are you sure you want to delete %s job?</source>
+ <translation>确定要删除 %s 工作?</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Delete job</source>
+ <translation>删除工作</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Delete *all* job</source>
+ <translation>删除*所有*工作</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Already done</source>
+ <translation>已经完成</translation>
+ </message>
+</context>
+<context>
+ <name>qlicense</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="+25"/>
+ <source>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux 是自由软件；您可以遵照自由软件基金会 (Free Software Foundation) 出版的 GNU 通用公共许可证条款 (GNU General Public License) 第二版来修改和重新发布这一程序。&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ </message>
+</context>
+<context>
+ <name>qmainfilter</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+680"/>
+ <source>Add</source>
+ <translation>加入</translation>
+ </message>
+ <message>
+ <location line="+145"/>
+ <source>Save video filters..</source>
+ <translation>保存视频过滤器..</translation>
+ </message>
+ <message>
+ <location line="-240"/>
+ <source>Make partial</source>
+ <translation>局部</translation>
+ </message>
+ <message>
+ <location line="-149"/>
+ <source>This filter cannot be made partial</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+145"/>
+ <source>Move up</source>
+ <translation>向上移动</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Configure</source>
+ <translation>配置</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Remove</source>
+ <translation>移除</translation>
+ </message>
+ <message>
+ <location line="-148"/>
+ <source>Partial</source>
+ <translation>区段</translation>
+ </message>
+ <message>
+ <location line="+146"/>
+ <source>Move down</source>
+ <translation>向下移动</translation>
+ </message>
+ <message>
+ <location line="+228"/>
+ <source>Load video filters..</source>
+ <translation>载入视频过滤器..</translation>
+ </message>
+</context>
+<context>
+ <name>qprocessing</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+160"/>
+ <source>_Resume</source>
+ <translation>_恢复</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Cancel it ?</source>
+ <translation>取消它吗?</translation>
+ </message>
+ <message>
+ <location line="-96"/>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+ <message>
+ <location line="+95"/>
+ <source>The processing is paused.</source>
+ <translation>程序暂停</translation>
+ </message>
+</context>
+<context>
+ <name>qprops</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
+ <source>No</source>
+ <translation>否</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Yes</source>
+ <translation>是</translation>
+ </message>
+ <message>
+ <location line="+75"/>
+ <source>Mono</source>
+ <translation>单音</translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <source>Audio</source>
+ <translation>音频</translation>
+ </message>
+ <message>
+ <location line="-23"/>
+ <source>Video</source>
+ <translation>视频</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Image Size:	</source>
+ <translation>图片大小(DAR):	</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>No Audio</source>
+ <translation>没音频</translation>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>Frame Rate:	</source>
+ <translation>帧率:	</translation>
+ </message>
+ <message>
+ <location line="-116"/>
+ <source>%2.3f fps</source>
+ <translation>%2.3f fps</translation>
+ </message>
+ <message>
+ <location line="+128"/>
+ <source>Extra data:	</source>
+ <translation> 额外数据：	</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Aspect Ratio:	</source>
+ <translation>像素比例(PAR)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Extra Video Properties</source>
+ <translation>额外视频属性</translation>
+ </message>
+ <message>
+ <location line="-116"/>
+ <location line="+74"/>
+ <source>%02d:%02d:%02d.%03d</source>
+ <translation>%02d:%02d:%02d.%03d</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Channels:	</source>
+ <translation>频道:	</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Codec 4CC:	</source>
+ <translation>编译码器 4CC:</translation>
+ </message>
+ <message>
+ <location line="-64"/>
+ <source>Stereo</source>
+ <translation>立体声</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Codec:		</source>
+ <translation>编译码器：		</translation>
+ </message>
+ <message>
+ <location line="-137"/>
+ <source>%s (%u:%u)</source>
+ <translation>%s (%u:%u)</translation>
+ </message>
+ <message>
+ <location line="+141"/>
+ <source>Bitrate:	</source>
+ <translation>比特率:	</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Frequency:	</source>
+ <translation>频率:	</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>ExtraDataSize:	</source>
+ <translation>额外的数据大小：	</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <location line="+27"/>
+ <source>Total Duration:	</source>
+ <translation>总持续时间：	</translation>
+ </message>
+</context>
+<context>
+ <name>qshell</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+44"/>
+ <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
+Ready.
+</source>
+ <translation>你可以使用 CTRL + PageUP and CTRL+Page到回到先前命令准备时。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Enter your commands then press the evaluate button or CTRL+ENTER.
+</source>
+ <translation>输入您的命令，然后按下求值按钮或按 CTRL + ENTER。</translation>
+ </message>
+</context>
+<context>
+ <name>qtalert</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+38"/>
+ <location line="+25"/>
+ <location line="+25"/>
+ <source>Info</source>
+ <translation>信息</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Alert</source>
+ <translation>警告</translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <location line="+30"/>
+ <source>Question</source>
+ <translation>问题</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Question?</source>
+ <translation>问题?</translation>
+ </message>
+ <message>
+ <location line="-72"/>
+ <location line="+30"/>
+ <source>Confirmation</source>
+ <translation>答复</translation>
+ </message>
+</context>
+<context>
+ <name>qtray</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
+ <source>Open Avidemux</source>
+ <translation>开启 Avidemux</translation>
+ </message>
+</context>
+<context>
+ <name>qvobsub</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
+ <source>Select Idx File</source>
+ <translation>选择 Idx 文件</translation>
+ </message>
+</context>
+<context>
+ <name>removeplane</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+46"/>
+ <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
+ <translation>删除 Y，U 或 V 平面 （主要用于调试其他筛选器）。</translation>
+ </message>
+ <message>
+ <location line="+106"/>
+ <source>Keep U Plane</source>
+ <translation>保持 U 平面</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Process chromaV plane</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Remove plane</source>
+ <translation>删除平面</translation>
+ </message>
+ <message>
+ <location line="-113"/>
+ <source>Remove Plane</source>
+ <translation>3.4-删除平面</translation>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Process chromaU plane</source>
+ <translation>程序 色度U 平面</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Process luma plane</source>
+ <translation>处理明度平面</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Keep V Plane</source>
+ <translation>保持 V 平面</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Keep Y Plane</source>
+ <translation>保持 Y 平面</translation>
+ </message>
+</context>
+<context>
+ <name>resampleFps</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+46"/>
+ <source>29.97 (NTSC)</source>
+ <translation>29.97 (NTSC)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>50 (Pal)</source>
+ <translation>50 (Pal)</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>25 (PAL)</source>
+ <translation>25 (PAL)</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Resample FPS</source>
+ <translation>1.0-调整帧速度(重新取样)-用在数码转换DVD</translation>
+ </message>
+ <message>
+ <location line="+285"/>
+ <source>Resample fps</source>
+ <translation>重新取样 fps</translation>
+ </message>
+ <message>
+ <location line="-325"/>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <location line="+318"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
+ </message>
+ <message>
+ <location line="-316"/>
+ <source>23.976 (Film)</source>
+ <translation>23.976 (电影)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>59.93 (NTSC)</source>
+ <translation>59.93 (NTSC)</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Change and enforce FPS. Keep duration and sync.</source>
+ <translation>结束时间仍然一样，例如15 fps电影从数码转换 DVD，一般PC上看不出来效果。</translation>
+ </message>
+ <message>
+ <location line="+278"/>
+ <source>_New frame rate:</source>
+ <translation>_新帧率:</translation>
+ </message>
+</context>
+<context>
+ <name>resize</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+ <source>swScale Resizer.</source>
+ <translation>调整比例像素大小。</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+ <source>Width and height cannot be odd</source>
+ <translation>宽度和高度不能为奇数</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="-1"/>
+ <source>swsResize</source>
+ <translation>1.2-调整视频尺寸-比例像素大小</translation>
+ </message>
+</context>
+<context>
+ <name>resizeDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+264"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+287"/>
+ <source>1%</source>
+ <translation>1%</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <source>1:1</source>
+ <translation>1:1</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <source>4:3</source>
+ <translation>4:3</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <source>16:9</source>
+ <translation>16:9</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+40"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+212"/>
+ <source>200%</source>
+ <translation>200%</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-230"/>
+ <source>Destination:</source>
+ <translation>目的檔:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+116"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+346"/>
+ <source>Bilinear</source>
+ <translation>双线性</translation>
+ </message>
+ <message>
+ <location line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-66"/>
+ <source>Error X / Y:</source>
+ <translation>错误 X / Y:</translation>
+ </message>
+ <message>
+ <location line="-317"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-340"/>
+ <source>Lock Aspect Ratio</source>
+ <translation>保持像素比</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-12"/>
+ <source>Aspect Ratio</source>
+ <translation>像素比例( PAR)</translation>
+ </message>
+ <message>
+ <location line="+336"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+359"/>
+ <source>0.00 / 0.00</source>
+ <translation>0.00 / 0.00</translation>
+ </message>
+ <message>
+ <location line="-348"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-371"/>
+ <source>Resize</source>
+ <translation>重设大小</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+54"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+148"/>
+ <source>Width:</source>
+ <translation>宽度:</translation>
+ </message>
+ <message>
+ <location line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+146"/>
+ <source>Percent</source>
+ <translation>百分比</translation>
+ </message>
+ <message>
+ <location line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+146"/>
+ <source>Lanzcos3</source>
+ <translation>Lanzcos3三阶线性</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-5"/>
+ <source>Bicubic</source>
+ <translation>双立方</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-393"/>
+ <source>Source:</source>
+ <translation>来源:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="-216"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+177"/>
+ <source>Round to the Nearest Multiple of 16</source>
+ <translation>被最接近16倍整除的四舍五入整数</translation>
+ </message>
+ <message>
+ <location line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-91"/>
+ <source>Resize Dimensions</source>
+ <translation>调整显示尺寸(DAR)</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+56"/>
+ <source>Height:</source>
+ <translation>高度:</translation>
+ </message>
+ <message>
+ <location line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+238"/>
+ <source>Resize Method:</source>
+ <translation>重设大小方式:</translation>
+ </message>
+</context>
+<context>
+ <name>rotate</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+209"/>
+ <source>90°</source>
+ <translation>90°</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>180°</source>
+ <translation>180°</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>270°</source>
+ <translation>270°</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_Angle:</source>
+ <translation>_角度:</translation>
+ </message>
+ <message>
+ <location line="-161"/>
+ <location line="+163"/>
+ <source>Rotate</source>
+ <translation>1.1-顺时针旋转</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>180 degrees</source>
+ <translation>180 度</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>270 degrees</source>
+ <translation>270 度</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>90 degrees</source>
+ <translation>90 度</translation>
+ </message>
+ <message>
+ <location line="-156"/>
+ <source>Rotate the image by 90/180/270 degrees.</source>
+ <translation>旋转图片90/180/270度</translation>
+ </message>
+</context>
+<context>
+ <name>seekablePreviewDialog</name>
+ <message>
+ <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+78"/>
+ <source>&gt;</source>
+ <translation>&gt;</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>&lt;&lt;</source>
+ <translation>&lt;&lt;</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>&gt;&gt;</source>
+ <translation>&gt;&gt;</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Play</source>
+ <translation>播放/停止</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Back one minute</source>
+ <translation>后一分钟</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Next image</source>
+ <translation>下一张图像</translation>
+ </message>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
+ <source>Preview</source>
+ <translation>预览</translation>
+ </message>
+ <message>
+ <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+3"/>
+ <source>Forward one minute</source>
+ <translation>前一分钟</translation>
+ </message>
+</context>
+<context>
+ <name>separateFields</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
+ <source>Separate Fields</source>
+ <translation>2.7-视频分离字段场上下挤压，画面在水平中带</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Split each image into 2 fields.</source>
+ <translation>分割两个图像，它会加倍的帧率，两倍数量的图像，和减半垂直分辨率。</translation>
+ </message>
+</context>
+<context>
+ <name>shaderLoader</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+194"/>
+ <source>Reload shader</source>
+ <translation>重载着色器</translation>
+ </message>
+</context>
+<context>
+ <name>sharpen</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+28"/>
+ <source>3x3 convolution filter :sharpen.</source>
+ <translation>3 x 3 卷积过滤： 锐化。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Sharpen convolution.</source>
+ <translation>5.3-锐化卷积(Sharpen convolution)</translation>
+ </message>
+</context>
+<context>
+ <name>stackfield</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
+ <source>Stack Fields</source>
+ <translation>2.8-非堆栈字段场(底上顶下交换)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Put even lines on top, odd lines at bottom.</source>
+ <translation>将偶数行放在上面，奇数行放下面，，是用来看看一些堆栈情况，如需改进。</translation>
+ </message>
+</context>
+<context>
+ <name>stillimage</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+181"/>
+ <source>_Start time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Duration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>swapuv</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+42"/>
+ <source>Swap the U and V planes.</source>
+ <translation>U和V交换色彩</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Swap UV</source>
+ <translation>3.3-交换 UV色彩</translation>
+ </message>
+</context>
+<context>
+ <name>telecide</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+193"/>
+ <source>Top</source>
+ <translation>顶部</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Never</source>
+ <translation>从不</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>_Direct threshold:</source>
+ <translation>_正向界限值:</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>If still combed</source>
+ <translation>如果仍然有梳形噪声</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Process image (not fields)</source>
+ <translation>处理图像 (非帧字段场)</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Decomb Telecide</source>
+ <translation>2.4-迪刊谋.贴立赛德(Decomb Telecide)-除梳下拉反向混合色度信息</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
+ <source>Decomb telecide</source>
+ <translation>2.4-迪刊谋.贴立赛德(Decomb Telecide)-除梳下拉反向混合色度信息</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="-18"/>
+ <source>_Try backward:</source>
+ <translation>_尝试反向:</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Always</source>
+ <translation>总是</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+1"/>
+ <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
+ <translation>唐纳德(Donald Graft)抽取，用渐进式帧替换 ivtc 模式，视频停留在 30 fps。</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+26"/>
+ <source>Bl_end</source>
+ <translation>混_合</translation>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>Bottom</source>
+ <translation>底部</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Debu_g</source>
+ <translation>除_错</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>_Noise threshold:</source>
+ <translation>_噪声界限值:</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>_Postprocessing:</source>
+ <translation>_后置处理:</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Sho_w info</source>
+ <translation>显示_信息</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>_Field order:</source>
+ <translation>_字段场优先级:</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Process image (not fields), debug</source>
+ <translation>处理图像 (非帧字段场)，调试</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>NTSC converted from PAL</source>
+ <translation>从 PAL 转成 NTSC</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>_Strategy:</source>
+ <translation>_策略:</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Postproc on best match</source>
+ <translation>在最佳比对上执行后置处理</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>3:2 pulldown</source>
+ <translation>往下拉3:2</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Postproc and show zones (debug)</source>
+ <translation>后置处理和显示区域 (调试)</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Postp_rocessing threshold:</source>
+ <translation>后置_处理界限值:</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>No strategy</source>
+ <translation>无策略</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>_Use chroma to decide</source>
+ <translation>_使用色度来判定</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>_Backward threshold:</source>
+ <translation>_反向界限值:</translation>
+ </message>
+ <message>
+ <location line="-31"/>
+ <source>PAL/SECAM</source>
+ <translation>PAL/SECAM</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>None but compute</source>
+ <translation>无但计算</translation>
+ </message>
+</context>
+<context>
+ <name>timestamp</name>
+ <message>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> m</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>tsdemuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+196"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+333"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+91"/>
+ <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>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" 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>
+</context>
+<context>
+ <name>twolame</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率:</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>TwoLame Configuration</source>
+ <translation>两个Lame的配置</translation>
+ </message>
+</context>
+<context>
+ <name>uisupport</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
+ <source>X11</source>
+ <translation>X11</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>MS Windows GDI</source>
+ <translation>MS Windows GDI</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>OpenGL</source>
+ <translation>OpenGL</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Mac OS X Quartz 2D</source>
+ <translation>Mac OS X Quartz 2D</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>MS Windows Direct3D</source>
+ <translation>MS Windows Direct3D</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Default Raster</source>
+ <translation>默认栅格</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Mac OS X QuickDraw</source>
+ <translation>Mac OS X QuickDraw</translation>
+ </message>
+</context>
+<context>
+ <name>unstackfield</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp" line="+47"/>
+ <source>Unstack Fields</source>
+ <translation>2.8-非堆栈字段场(底上顶下交换)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Weave top and bottom halves.</source>
+ <translation>上半部和下半部交换，是用来看看一些交换情况，如需改进。</translation>
+ </message>
+</context>
+<context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaH264</name>
+ <message>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>_Bitrate(kbps)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>vaapiResize</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+208"/>
+ <source>vaapi</source>
+ <translation>vaapi</translation>
+ </message>
+ <message>
+ <location line="-140"/>
+ <source>vaapi: Resize image using vaapi.</source>
+ <translation>vaapi： 使用 vaapi 的大小调整图像。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>vaapi: Resize</source>
+ <translation>vaapi: 重设大小</translation>
+ </message>
+ <message>
+ <location line="+137"/>
+ <source>mpeg-&gt;PC:</source>
+ <translation>mpeg-&gt;PC:</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Height :</source>
+ <translation>高 :</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Width :</source>
+ <translation>宽 :</translation>
+ </message>
+</context>
+<context>
+ <name>vaenc</name>
+ <message>
+ <source>Bitrate (kbps):</source>
+ <translation type="vanished">比特速率 (kbps):</translation>
+ </message>
+ <message>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="vanished">最大比特速率 (kbps):</translation>
+ </message>
+ <message>
+ <source>VAAPI H264 Encoder</source>
+ <translation type="vanished">VAAPI H264 编码器</translation>
+ </message>
+</context>
+<context>
+ <name>vdpaudeint</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+332"/>
+ <source>vdpau</source>
+ <translation>vdpau</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>_Deint Mode:</source>
+ <translation>_Deint 模式:</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>_Ivtc:</source>
+ <translation>_Ivtc:</translation>
+ </message>
+ <message>
+ <location line="-193"/>
+ <source>vdpauDeint</source>
+ <translation>vdpau去交错</translation>
+ </message>
+ <message>
+ <location line="+194"/>
+ <source>_Resize:</source>
+ <translation>_重设大小</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Keep Top Field</source>
+ <translation>保持顶部</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Keep Bottom Field</source>
+ <translation>保持底部</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Height :</source>
+ <translation>高 :</translation>
+ </message>
+ <message>
+ <location line="-196"/>
+ <source>VDPAU deinterlacer (+resize).</source>
+ <translation>VDPAU 去交错化 （+ 重设大小）</translation>
+ </message>
+ <message>
+ <location line="+195"/>
+ <source>Width :</source>
+ <translation>宽 :</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Double framerate</source>
+ <translation>双倍帧率</translation>
+ </message>
+</context>
+<context>
+ <name>vdpresize</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+208"/>
+ <source>vdpau</source>
+ <translation>vdpau</translation>
+ </message>
+ <message>
+ <location line="-138"/>
+ <source>vdpau: Resize image using vdpau.</source>
+ <translation>vdpau: 使用vdpau调整图像大小。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>vdpau: Resize</source>
+ <translation>vdpau: 重设大小</translation>
+ </message>
+ <message>
+ <location line="+135"/>
+ <source>Height :</source>
+ <translation>高 :</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Width :</source>
+ <translation>宽 :</translation>
+ </message>
+</context>
+<context>
+ <name>vflip</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+48"/>
+ <source>Vertically flip the image.</source>
+ <translation>垂直翻转图像-对X轴翻转</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Vertical Flip</source>
+ <translation>1.1-上下颠倒</translation>
+ </message>
+</context>
+<context>
+ <name>vobSubDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+74"/>
+ <source>Idx File :</source>
+ <translation>Idx 文件 :</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Select File</source>
+ <translation>选择文件</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Delay :</source>
+ <translation>延迟</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Subtitle Font Size and Position</source>
+ <translation>字幕字号和位置</translation>
+ </message>
+ <message>
+ <location line="+54"/>
+ <source>Language :</source>
+ <translation>语言:</translation>
+ </message>
+</context>
+<context>
+ <name>vorbis</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+331"/>
+ <source>VBR</source>
+ <translation>可变比特率(VBR)</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>_Bitrate:</source>
+ <translation>_比特率:</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Quality based</source>
+ <translation>基本质量</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>_Quality:</source>
+ <translation>_质量:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Vorbis Configuration</source>
+ <translation>Vorbis 配置</translation>
+ </message>
+</context>
+<context>
+ <name>vsWindow</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+68"/>
+ <source>VS File Files (*.vpy)</source>
+ <translation>VS 的檔 (*.vpy)</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Open VapourSynth File 1</source>
+ <translation>打开 VapourSynth 檔 1</translation>
+ </message>
+</context>
+<context>
+ <name>webmmuxer</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+28"/>
+ <source>Display width</source>
+ <translation>显示宽度</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Force display width</source>
+ <translation>强制显示宽度</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+156"/>
+ <source>Saving Webm</source>
+ <translation>保存 Webm</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>Unsupported Audio.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+ <translation>只有 VP8/VP9 视频和 Vorbis/s/Opus音频支援</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Unsupported Video.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+ <translation>只有 VP8/VP9 视频和 Vorbis/Opus音频支援</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+4"/>
+ <source>Webm Muxer</source>
+ <translation>Webm复合器</translation>
+ </message>
+</context>
+<context>
+ <name>workingDialog</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+77"/>
+ <source>Elapsed:</source>
+ <translation>已过时间:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
+ </message>
+ <message>
+ <location line="-26"/>
+ <source>Time Remaining:</source>
+ <translation>剩余时间:</translation>
+ </message>
+ <message>
+ <location line="+113"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <location line="-199"/>
+ <source>Processing</source>
+ <translation>处理中</translation>
+ </message>
+</context>
+<context>
+ <name>x264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+637"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="-459"/>
+ <source>none</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+610"/>
+ <location line="+69"/>
+ <location line="+14"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location line="-144"/>
+ <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+ <translation>宏块优化需要平差自适应量化(AQ)来启用，将自动禁用宏块优化，您要继续吗？</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>Save Profile</source>
+ <translation>保存设置檔</translation>
+ </message>
+ <message>
+ <location line="-167"/>
+ <source>Target Video Size:</source>
+ <translation>目标视频大小</translation>
+ </message>
+ <message>
+ <location line="+239"/>
+ <source>Do you really want to delete the </source>
+ <translation>你准备希望删除这</translation>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>Cannot load preset</source>
+ <translation>无法加载默认定</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <location line="-666"/>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <location line="+646"/>
+ <source>Cannot save preset</source>
+ <translation>无法保存默认定</translation>
+ </message>
+ <message>
+ <location line="-230"/>
+ <source>Quantiser:</source>
+ <translation>量化器:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+ <source>Not coded</source>
+ <translation>不编码</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="-4"/>
+ <location line="+19"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
+ </message>
+ <message>
+ <location line="+172"/>
+ <source>my profile</source>
+ <translation>我的设置檔</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Replace the following preset ?:</source>
+ <translation>替代以下的默认定吗?</translation>
+ </message>
+ <message>
+ <location line="-226"/>
+ <source>Target Bitrate:</source>
+ <translation>目标比特速率：</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Average Bitrate:</source>
+ <translation>平均比特率(ABR):</translation>
+ </message>
+ <message>
+ <location line="+235"/>
+ <source> profile ?.
+If it is a system profile it will be recreated next time.</source>
+ <translation>设置檔 ?
+ 如果它是一个系统设置文件，它将在下一次建立。</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+0"/>
+ <source>this mode has not been implemented
+</source>
+ <translation>这种模式不被执行</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="-245"/>
+ <source>Quality:</source>
+ <translation>质量:</translation>
+ </message>
+ <message>
+ <location line="+240"/>
+ <source>Cannot delete custom profile</source>
+ <translation>不能删除自定义的设置檔</translation>
+ </message>
+ <message>
+ <location line="-23"/>
+ <source>Overwrite</source>
+ <translation>复写</translation>
+ </message>
+ <message>
+ <location line="-133"/>
+ <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"/>
+ <source>Delete preset</source>
+ <translation>删除默认定</translation>
+ </message>
+</context>
+<context>
+ <name>x264ConfigDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+2526"/>
+ <location line="+179"/>
+ <location line="+302"/>
+ <source>%</source>
+ <translation>%</translation>
+ </message>
+ <message>
+ <location line="-2114"/>
+ <source>0</source>
+ <translation>0</translation>
+ </message>
+ <message>
+ <location line="-664"/>
+ <location line="+669"/>
+ <source>1</source>
+ <translation>1</translation>
+ </message>
+ <message>
+ <location line="-649"/>
+ <source>2</source>
+ <translation>2</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <location line="+639"/>
+ <source>3</source>
+ <translation>3</translation>
+ </message>
+ <message>
+ <location line="-624"/>
+ <source>4</source>
+ <translation>4</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>5</source>
+ <translation>5</translation>
+ </message>
+ <message>
+ <location line="+614"/>
+ <source>7</source>
+ <translation>7</translation>
+ </message>
+ <message>
+ <location line="+2583"/>
+ <source>:</source>
+ <translation>:</translation>
+ </message>
+ <message>
+ <location line="-2578"/>
+ <source>15</source>
+ <translation>15</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>31</source>
+ <translation>31</translation>
+ </message>
+ <message>
+ <location line="-457"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source>1.1</source>
+ <translation>1.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>1.2</source>
+ <translation>1.2</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>1.3</source>
+ <translation>1.3</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>2.1</source>
+ <translation>2.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>2.2</source>
+ <translation>2.2</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>3.1</source>
+ <translation>3.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>3.2</source>
+ <translation>3.2</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>4.1</source>
+ <translation>4.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>4.2</source>
+ <translation>4.2</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>5.1</source>
+ <translation>5.1</translation>
+ </message>
+ <message>
+ <location line="+2977"/>
+ <source>Custom:</source>
+ <comment>multithreading</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+688"/>
+ <source>CBR</source>
+ <translation>CBR</translation>
+ </message>
+ <message>
+ <location line="-763"/>
+ <source>Add</source>
+ <translation>加入</translation>
+ </message>
+ <message>
+ <location line="+695"/>
+ <source>FCC</source>
+ <translation>FCC</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>GBR</source>
+ <translation>GBR</translation>
+ </message>
+ <message>
+ <location line="-199"/>
+ <source>MAC</source>
+ <translation>MAC</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>PAL</source>
+ <translation>PAL逐行倒相</translation>
+ </message>
+ <message>
+ <location line="+257"/>
+ <source>VBR</source>
+ <translation>VBR</translation>
+ </message>
+ <message>
+ <location line="-3621"/>
+ <source>Fast First Pass</source>
+ <translation>快速第1通</translation>
+ </message>
+ <message>
+ <location line="-114"/>
+ <location line="+1149"/>
+ <source>Auto</source>
+ <translation>自动</translation>
+ </message>
+ <message>
+ <location line="+2283"/>
+ <source>Crop</source>
+ <translation>剪切</translation>
+ </message>
+ <message>
+ <location line="-1304"/>
+ <location line="+856"/>
+ <source>Edit</source>
+ <translation>编辑</translation>
+ </message>
+ <message>
+ <location line="-1412"/>
+ <source>Fast</source>
+ <translation>快</translation>
+ </message>
+ <message>
+ <location line="+1984"/>
+ <source>Film</source>
+ <translation>电影</translation>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>NTSC</source>
+ <translation>NTSC国家电视系统委员会</translation>
+ </message>
+ <message>
+ <location line="-2349"/>
+ <location line="+2596"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="-303"/>
+ <source>Show</source>
+ <translation>指示</translation>
+ </message>
+ <message>
+ <location line="-678"/>
+ <source>kbit</source>
+ <translation>kbit</translation>
+ </message>
+ <message>
+ <location line="-1457"/>
+ <source>CABAC</source>
+ <translation>CABAC（上下文自适应二进制算术编码）</translation>
+ </message>
+ <message>
+ <location line="+2239"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT709</source>
+ <translation>BT709</translation>
+ </message>
+ <message>
+ <location line="-3780"/>
+ <source>Basic</source>
+ <translation>基本</translation>
+ </message>
+ <message>
+ <location line="+1393"/>
+ <source>Frame</source>
+ <translation>帧</translation>
+ </message>
+ <message>
+ <location line="+412"/>
+ <source>Minimum:</source>
+ <translation>最小:</translation>
+ </message>
+ <message>
+ <location line="+1796"/>
+ <source>SECAM</source>
+ <translation>SECAM顺序彩色与记忆</translation>
+ </message>
+ <message>
+ <location line="+209"/>
+ <source>YCgCo</source>
+ <translation>YCgCo</translation>
+ </message>
+ <message>
+ <location line="-740"/>
+ <source>Zones</source>
+ <translation>缓冲区</translation>
+ </message>
+ <message>
+ <location line="-58"/>
+ <source>Maximum Macroblocks per Slice:</source>
+ <translation>切割每帧最大宏块</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>bytes</source>
+ <translation>bytes比特</translation>
+ </message>
+ <message>
+ <location line="-1796"/>
+ <location line="+450"/>
+ <location line="+36"/>
+ <source>Disabled</source>
+ <translation>禁用</translation>
+ </message>
+ <message>
+ <location line="-453"/>
+ <source>Direct Prediction Mode:</source>
+ <translation>直接预测模式</translation>
+ </message>
+ <message>
+ <location line="+2270"/>
+ <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
+ <translation>这些设置只是建议播放设备，使用您自担风险。</translation>
+ </message>
+ <message>
+ <location line="-548"/>
+ <source>VBV Buffer Size:</source>
+ <translation>VBV 缓冲容量 :</translation>
+ </message>
+ <message>
+ <location line="-1715"/>
+ <source>Weighted Prediction for P-frames:</source>
+ <translation>P-帧的加权预测:</translation>
+ </message>
+ <message>
+ <location line="+1203"/>
+ <source>Maximum Quantiser Step:</source>
+ <translation>最大量化步骤:</translation>
+ </message>
+ <message>
+ <location line="+537"/>
+ <source>Maximum Size per Slice:</source>
+ <translation>切割每帧最大容量</translation>
+ </message>
+ <message>
+ <location line="-264"/>
+ <source>Variance AQ:</source>
+ <translation>可变 AQ:</translation>
+ </message>
+ <message>
+ <location line="-2149"/>
+ <source>Advanced Rate Control</source>
+ <translation>高级速率控制(RC)</translation>
+ </message>
+ <message>
+ <location line="+3007"/>
+ <source>Video Format:</source>
+ <translation>视频格式 :</translation>
+ </message>
+ <message>
+ <location line="-265"/>
+ <source>Generate fake interlaced</source>
+ <translation>生成假去错</translation>
+ </message>
+ <message>
+ <location line="-2247"/>
+ <source>Motion Vector</source>
+ <translation>向量运动</translation>
+ </message>
+ <message>
+ <location line="-766"/>
+ <source>Constant Quantiser (Single Pass)</source>
+ <translation>恒定量化器(QP)(1通)</translation>
+ </message>
+ <message>
+ <location line="+2040"/>
+ <source>I and P-frame Quantiser Ratio:</source>
+ <translation>P:I , P-帧量化率:</translation>
+ </message>
+ <message>
+ <location line="+872"/>
+ <source>Enforce Repeatability</source>
+ <translation>强制回放</translation>
+ </message>
+ <message>
+ <location line="-731"/>
+ <source>P and B-frame Quantiser Ratio:</source>
+ <translation>B:P, B-帧量化率:</translation>
+ </message>
+ <message>
+ <location line="-675"/>
+ <source>GOP Size:</source>
+ <translation>GOP(图像群组) 大小:</translation>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>B-frame Bias:</source>
+ <translation>B 帧偏好:</translation>
+ </message>
+ <message>
+ <location line="-883"/>
+ <source>Hexagonal Search</source>
+ <translation>六角形搜寻</translation>
+ </message>
+ <message>
+ <location line="-609"/>
+ <source>Target Video Size:</source>
+ <translation>目标视频大小</translation>
+ </message>
+ <message>
+ <location line="+1060"/>
+ <source>8x8 DCT Spatial Transform</source>
+ <translation>8 x 8 DCT 空间变换</translation>
+ </message>
+ <message>
+ <location line="-354"/>
+ <source>11 (Best)</source>
+ <translation>11 (最好)</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>1 (Fast)</source>
+ <translation>1 (快)</translation>
+ </message>
+ <message>
+ <location line="+401"/>
+ <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
+ <translation>8x8，8x16和16x8 P-帧内预测块状</translation>
+ </message>
+ <message>
+ <location line="+748"/>
+ <source>Noise Reduction:</source>
+ <translation>降低噪声</translation>
+ </message>
+ <message>
+ <location line="-433"/>
+ <source>Non-strict (Not Blu-ray Compatible)</source>
+ <translation>非严格（不与Blu-ray蓝光相容）</translation>
+ </message>
+ <message>
+ <location line="+634"/>
+ <source>Quantiser Control</source>
+ <translation>量化控制</translation>
+ </message>
+ <message>
+ <location line="-994"/>
+ <source>Constrained Intra Prediction</source>
+ <translation>帧内预测的约束</translation>
+ </message>
+ <message>
+ <location line="-989"/>
+ <source>Average Bitrate (Two Pass)</source>
+ <translation>平均比特率(ABR)(2通)</translation>
+ </message>
+ <message>
+ <location line="+2991"/>
+ <source>BluRay compatibility</source>
+ <translation>BluRay兼容</translation>
+ </message>
+ <message>
+ <location line="-729"/>
+ <source>Quantiser Curve Compression</source>
+ <translation>量化曲线压缩(QCComp)</translation>
+ </message>
+ <message>
+ <location line="-1221"/>
+ <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
+ <translation>8x8，8x16和16x8 B-帧内预测块状</translation>
+ </message>
+ <message>
+ <location line="+442"/>
+ <source>I-frames</source>
+ <translation>I-帧(内帧,前帧)</translation>
+ </message>
+ <message>
+ <location line="-160"/>
+ <source>B-frames</source>
+ <translation>B-帧 (介于前I帧与后P帧间连续预测帧，例如: IBBBPBBBPBBBPBBBIBBBP....)</translation>
+ </message>
+ <message>
+ <location line="+1525"/>
+ <source>Auto-detect</source>
+ <translation>自动侦测</translation>
+ </message>
+ <message>
+ <location line="-1375"/>
+ <source>Adaptive B-frame Decision:</source>
+ <translation>自适应 B-帧的决定：</translation>
+ </message>
+ <message>
+ <location line="-219"/>
+ <source>Top Field First</source>
+ <translation>顶部首先字段</translation>
+ </message>
+ <message>
+ <location line="+579"/>
+ <source>Inter Luma Quantisation Deadzone:</source>
+ <translation>内明度量化静区：</translation>
+ </message>
+ <message>
+ <location line="-180"/>
+ <source>Trellis Quantization:</source>
+ <translation>网格量化</translation>
+ </message>
+ <message>
+ <location line="+173"/>
+ <source>Intra Luma Quantisation Deadzone:</source>
+ <translation>内明度量化静区 :</translation>
+ </message>
+ <message>
+ <location line="+489"/>
+ <source>Reduce Fluctuation Before Curve Compression:</source>
+ <translation>减少波动曲线压缩之前：</translation>
+ </message>
+ <message>
+ <location line="+966"/>
+ <source>Component</source>
+ <translation>合成的</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <location line="+63"/>
+ <source>BT470M</source>
+ <translation>BT470M</translation>
+ </message>
+ <message>
+ <location line="-1782"/>
+ <location line="+6"/>
+ <source>Analysis</source>
+ <translation>分析</translation>
+ </message>
+ <message>
+ <location line="-1716"/>
+ <source>Zero Latency</source>
+ <translation>零延迟</translation>
+ </message>
+ <message>
+ <location line="+347"/>
+ <source>Maximum Constant Rate Factor</source>
+ <translation>最大恒定速率系数(CRF模式)</translation>
+ </message>
+ <message>
+ <location line="+2571"/>
+ <source>Multithreading</source>
+ <translation>多线程</translation>
+ </message>
+ <message>
+ <location line="-3186"/>
+ <location line="+3152"/>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <location line="+311"/>
+ <source>Predefined Aspect Ratio:</source>
+ <translation>预定义PAR:</translation>
+ </message>
+ <message>
+ <location line="-2529"/>
+ <source>Uneven Multi-hexagonal Search</source>
+ <translation>六角形搜索</translation>
+ </message>
+ <message>
+ <location line="-331"/>
+ <source>Advanced RC</source>
+ <translation>高级速率控制(RC)</translation>
+ </message>
+ <message>
+ <location line="-342"/>
+ <source>Fast Decode</source>
+ <translation>快速解碼</translation>
+ </message>
+ <message>
+ <location line="+991"/>
+ <source>Weighted References + Duplicates</source>
+ <translation>加权参考+重复</translation>
+ </message>
+ <message>
+ <location line="+2523"/>
+ <source>LOG100</source>
+ <translation>LOG100</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>LOG316</source>
+ <translation>LOG316</translation>
+ </message>
+ <message>
+ <location line="-1247"/>
+ <source>Chroma to Luma Quantiser Offset:</source>
+ <translation>从色度到明度量化偏移量：</translation>
+ </message>
+ <message>
+ <location line="-2405"/>
+ <source>IDC Level:</source>
+ <translation>IDC级别</translation>
+ </message>
+ <message>
+ <location line="+3642"/>
+ <source>Linear</source>
+ <translation>线性</translation>
+ </message>
+ <message>
+ <location line="-1500"/>
+ <source>JVT Matrix</source>
+ <translation>JVT 矩阵</translation>
+ </message>
+ <message>
+ <location line="-1058"/>
+ <source>Minimum Buffer Between Threads:</source>
+ <translation>线程间的最小缓冲区:</translation>
+ </message>
+ <message>
+ <location line="-315"/>
+ <source>Motion</source>
+ <translation>运动</translation>
+ </message>
+ <message>
+ <location line="+2482"/>
+ <source>As Input</source>
+ <translation>另输出为其他输入档(保留原始视频的PAR)</translation>
+ </message>
+ <message>
+ <location line="-42"/>
+ <source>Generate Access Unit Delimiters</source>
+ <translation>生成存取单元分隔符</translation>
+ </message>
+ <message>
+ <location line="-566"/>
+ <source>Normal</source>
+ <translation>正常</translation>
+ </message>
+ <message>
+ <location line="+560"/>
+ <source>Output</source>
+ <translation>输出</translation>
+ </message>
+ <message>
+ <location line="-1071"/>
+ <source>Flat Matrix</source>
+ <translation>平面矩阵</translation>
+ </message>
+ <message>
+ <location line="+1452"/>
+ <location line="+78"/>
+ <location line="+58"/>
+ <source>SMPTE240M</source>
+ <translation>SMPTE240M</translation>
+ </message>
+ <message>
+ <location line="-141"/>
+ <location line="+136"/>
+ <source>SMPTE170M</source>
+ <translation>SMPTE170M</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>HRD Parameters:</source>
+ <translation>HRD 参数：</translation>
+ </message>
+ <message>
+ <location line="-3423"/>
+ <location line="+200"/>
+ <source>0 (High Quality)</source>
+ <translation>0 (高质量)</translation>
+ </message>
+ <message>
+ <location line="+1024"/>
+ <source>B-frames as References:</source>
+ <translation>B 帧作为参考:</translation>
+ </message>
+ <message>
+ <location line="+2131"/>
+ <source>Colour Matrix:</source>
+ <translation>颜色矩阵：</translation>
+ </message>
+ <message>
+ <location line="-3480"/>
+ <source>Constant Bitrate (Single Pass)</source>
+ <translation>固定比特率(CBR)(1通)</translation>
+ </message>
+ <message>
+ <location line="+3624"/>
+ <source>Full Range Samples</source>
+ <translation>全范围色度样品</translation>
+ </message>
+ <message>
+ <location line="-1705"/>
+ <source>Quantisation Matrix</source>
+ <translation>量化矩阵</translation>
+ </message>
+ <message>
+ <location line="-1748"/>
+ <location line="+200"/>
+ <source>51 (Low Quality)</source>
+ <translation>51 (低质量)</translation>
+ </message>
+ <message>
+ <location line="+1034"/>
+ <source>Optimal</source>
+ <translation>优化</translation>
+ </message>
+ <message>
+ <location line="-942"/>
+ <location line="+2490"/>
+ <source>frames</source>
+ <translation>帧</translation>
+ </message>
+ <message>
+ <location line="-1269"/>
+ <source>Final Macroblock Only</source>
+ <translation>最终的宏块(更快，中等质量)</translation>
+ </message>
+ <message>
+ <location line="-682"/>
+ <source>Weighted Prediction for B-frames</source>
+ <translation>B-帧的加权预测</translation>
+ </message>
+ <message>
+ <location line="+1441"/>
+ <source>Auto Variance AQ</source>
+ <translation>自动变量(AQ):</translation>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
+ </message>
+ <message>
+ <location line="-81"/>
+ <source>Initial VBV Buffer Occupancy:</source>
+ <translation>初始 VBV 缓冲区占用：</translation>
+ </message>
+ <message>
+ <location line="-1752"/>
+ <source>Maximum Motion Vector Length:</source>
+ <translation>最大向量运动长度:</translation>
+ </message>
+ <message>
+ <location line="+2560"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT470BG</source>
+ <translation>BT470BG</translation>
+ </message>
+ <message>
+ <location line="-3768"/>
+ <source>Preset:</source>
+ <translation>默认定:</translation>
+ </message>
+ <message>
+ <location line="+3291"/>
+ <source>Pixel Aspect Ratio</source>
+ <translation>像素宽高比(PAR)-(不同于外观比的显示宽高比(DAR))</translation>
+ </message>
+ <message>
+ <location line="-1316"/>
+ <source>Fast Skip Detection on P-frames</source>
+ <translation>快速跳过检测 P-帧 (场景中如有虚影时按取消)</translation>
+ </message>
+ <message>
+ <location line="-484"/>
+ <source>Normal Mode</source>
+ <translation>正常模式</translation>
+ </message>
+ <message>
+ <location line="-160"/>
+ <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
+ <translation>4x4，4x8和8x4 P-帧内预测块状</translation>
+ </message>
+ <message>
+ <location line="+589"/>
+ <source>Mixed References</source>
+ <translation>混合参考</translation>
+ </message>
+ <message>
+ <location line="+877"/>
+ <source>Advanced 1</source>
+ <translation>高级 1</translation>
+ </message>
+ <message>
+ <location line="+313"/>
+ <source>Advanced 2</source>
+ <translation>高级 2</translation>
+ </message>
+ <message>
+ <location line="-2699"/>
+ <location line="+200"/>
+ <location line="+1649"/>
+ <source>Quantiser</source>
+ <translation>量化器</translation>
+ </message>
+ <message>
+ <location line="+1455"/>
+ <source>SMPTEL170M</source>
+ <translation>SMPTEL170M</translation>
+ </message>
+ <message>
+ <location line="-309"/>
+ <source>16:15 (PAL 4:3)</source>
+ <translation>16:15 (PAL 4:3)</translation>
+ </message>
+ <message>
+ <location line="-2656"/>
+ <source>Sequence Parameter Set Identifer:</source>
+ <translation>序列参数设置标识符</translation>
+ </message>
+ <message>
+ <location line="+1134"/>
+ <source>Periodic Intra Refresh</source>
+ <translation>周期性帧内更新</translation>
+ </message>
+ <message>
+ <location line="-480"/>
+ <location line="+1328"/>
+ <source>Strength:</source>
+ <translation> 强度：</translation>
+ </message>
+ <message>
+ <location line="-1858"/>
+ <source>Hadamard Exhaustive Search</source>
+ <translation>Hadamard彻底搜寻（TESA）</translation>
+ </message>
+ <message>
+ <location line="+2071"/>
+ <source>Slices per Frame:</source>
+ <translation>切割每帧:</translation>
+ </message>
+ <message>
+ <location line="-1129"/>
+ <source>Maximum:</source>
+ <translation>最大 :</translation>
+ </message>
+ <message>
+ <location line="+737"/>
+ <source>Quantiser Curve Compression:</source>
+ <translation>量化曲线压缩(QCComp)</translation>
+ </message>
+ <message>
+ <location line="+858"/>
+ <source>64:45 (PAL 16:9)</source>
+ <translation>64:45 (PAL 16:9)</translation>
+ </message>
+ <message>
+ <location line="-3418"/>
+ <source>Profile:</source>
+ <translation>设置檔：</translation>
+ </message>
+ <message>
+ <location line="+1526"/>
+ <source>Interlaced:</source>
+ <translation>纯交错模式:</translation>
+ </message>
+ <message>
+ <location line="-650"/>
+ <source>Exhaustive Search</source>
+ <translation>彻底搜寻</translation>
+ </message>
+ <message>
+ <location line="-946"/>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
+ </message>
+ <message>
+ <location line="+1373"/>
+ <source>Partition</source>
+ <translation>画分</translation>
+ </message>
+ <message>
+ <location line="-147"/>
+ <source>Maximum Motion Vector Search Range:</source>
+ <translation>最大向量运动寻找范围:</translation>
+ </message>
+ <message>
+ <location line="+243"/>
+ <source>Loop Filter:</source>
+ <translation>循环过滤器:</translation>
+ </message>
+ <message>
+ <location line="+175"/>
+ <source>Maximum Reference Frames:</source>
+ <translation>最大参考帧数：</translation>
+ </message>
+ <message>
+ <location line="-713"/>
+ <source>Diamond Search</source>
+ <translation>菱形搜寻</translation>
+ </message>
+ <message>
+ <location line="+2085"/>
+ <source>Slicing</source>
+ <translation>切割</translation>
+ </message>
+ <message>
+ <location line="-3057"/>
+ <source>x264 Configuraton</source>
+ <translation>x264 配置</translation>
+ </message>
+ <message>
+ <location line="+1295"/>
+ <source>Weighted References</source>
+ <translation>加权参考</translation>
+ </message>
+ <message>
+ <location line="-344"/>
+ <source>Motion Estimation</source>
+ <translation>运动估计</translation>
+ </message>
+ <message>
+ <location line="+397"/>
+ <source>Spatial</source>
+ <translation>空间性</translation>
+ </message>
+ <message>
+ <location line="+1579"/>
+ <source>Video Buffer Verifier</source>
+ <translation>视频缓冲验证器(VBV)</translation>
+ </message>
+ <message>
+ <location line="+704"/>
+ <location line="+46"/>
+ <location line="+58"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>Undefined</source>
+ <translation>未定义</translation>
+ </message>
+ <message>
+ <source>Custom:</source>
+ <translation type="vanished">自定义 :</translation>
+ </message>
+ <message>
+ <location line="-3050"/>
+ <source>Macroblock-tree Rate Control</source>
+ <translation>宏块-树速率控制</translation>
+ </message>
+ <message>
+ <location line="+2713"/>
+ <source>8:9 (NTSC 4:3)</source>
+ <translation>8:9 (NTSC 4:3)</translation>
+ </message>
+ <message>
+ <location line="-2255"/>
+ <source>Prediction</source>
+ <translation>预测</translation>
+ </message>
+ <message>
+ <location line="+1963"/>
+ <source>Disable</source>
+ <translation>禁用</translation>
+ </message>
+ <message>
+ <location line="-627"/>
+ <source>Minimum Quantiser:</source>
+ <translation>最小量化</translation>
+ </message>
+ <message>
+ <location line="-649"/>
+ <source>I-frame Threshold:</source>
+ <translation>I-帧线程:</translation>
+ </message>
+ <message>
+ <location line="+1451"/>
+ <source>Custom:</source>
+ <comment>PAR</comment>
+ <translatorcomment>PAR</translatorcomment>
+ <translation>自定义 :</translation>
+ </message>
+ <message>
+ <location line="-998"/>
+ <source>Maximum Quantiser:</source>
+ <translation>最大量化:</translation>
+ </message>
+ <message>
+ <location line="-319"/>
+ <source>DCT Decimation on P-frames</source>
+ <translation>DCT 抽取对 P 帧</translation>
+ </message>
+ <message>
+ <location line="-1931"/>
+ <source>Tuning:</source>
+ <translation>调音:</translation>
+ </message>
+ <message>
+ <location line="+790"/>
+ <source>Motion Estimation Method:</source>
+ <translation>运动估计方法 :</translation>
+ </message>
+ <message>
+ <location line="-563"/>
+ <source>Video Size (Two Pass)</source>
+ <translation>视频大小(2通)</translation>
+ </message>
+ <message>
+ <location line="-294"/>
+ <source>Use advanced configuration</source>
+ <translation>使用高级配置</translation>
+ </message>
+ <message>
+ <location line="+1494"/>
+ <source>Open GOP:</source>
+ <translation>开启GOP(图像群组)</translation>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Frame Encoding</source>
+ <translation>帧编码</translation>
+ </message>
+ <message>
+ <location line="+119"/>
+ <source>Blu-ray Mode</source>
+ <translation>蓝ray光模式</translation>
+ </message>
+ <message>
+ <location line="+1925"/>
+ <source>32:27 (NTSC 16:9)</source>
+ <translation>32:27 (NTSC 16:9)</translation>
+ </message>
+ <message>
+ <location line="-1672"/>
+ <source>Maximum Consecutive B-frames:</source>
+ <translation>最大的连续 B 帧：</translation>
+ </message>
+ <message>
+ <location line="-514"/>
+ <source>Temporal</source>
+ <translation>时间性</translation>
+ </message>
+ <message>
+ <location line="+2268"/>
+ <source>Overscan:</source>
+ <translation>过度字段</translation>
+ </message>
+ <message>
+ <location line="-2060"/>
+ <source>Threshold:</source>
+ <translation>界限</translation>
+ </message>
+ <message>
+ <location line="+1812"/>
+ <source>Output 1</source>
+ <translation>输出 1:</translation>
+ </message>
+ <message>
+ <location line="+208"/>
+ <source>Output 2</source>
+ <translation>输出 2:</translation>
+ </message>
+ <message>
+ <location line="-2118"/>
+ <source>4x4 Intra-predicted Blocks</source>
+ <translation>4x4 内预测块状</translation>
+ </message>
+ <message>
+ <location line="+1335"/>
+ <source>Adaptive Quantisation</source>
+ <translation>自适应量化(AQ)</translation>
+ </message>
+ <message>
+ <location line="-728"/>
+ <source>Always On</source>
+ <translation>始终在（缓慢，质量最好）</translation>
+ </message>
+ <message>
+ <location line="-420"/>
+ <source>Bottom Field First</source>
+ <translation>底部首先字段</translation>
+ </message>
+ <message>
+ <location line="+496"/>
+ <source>Psychovisual Trellis:</source>
+ <translation>心理网格(Psy网格-此版本禁用)：</translation>
+ </message>
+ <message>
+ <location line="-2056"/>
+ <source>General</source>
+ <translation>一般</translation>
+ </message>
+ <message>
+ <location line="+2129"/>
+ <source>Luma Quantisation Deadzone</source>
+ <translation>明度量化静区：</translation>
+ </message>
+ <message>
+ <location line="-174"/>
+ <source>Chroma Motion Estimation</source>
+ <translation>色度运动估计(CME)</translation>
+ </message>
+ <message>
+ <location line="+1269"/>
+ <source>Custom Threaded Lookahead Buffer:</source>
+ <translation>自定义线程预测先行缓冲区：</translation>
+ </message>
+ <message>
+ <location line="-1858"/>
+ <source>8x8 Intra-predicted Blocks</source>
+ <translation>8x8 内预测块状</translation>
+ </message>
+ <message>
+ <location line="-1096"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
+ </message>
+ <message>
+ <location line="+2575"/>
+ <source>Maximum VBV Bitrate:</source>
+ <translation>最大 VBV 比特率 :</translation>
+ </message>
+ <message>
+ <location line="-2511"/>
+ <source>Encoding Mode:</source>
+ <translation>编码模式</translation>
+ </message>
+ <message>
+ <location line="+1321"/>
+ <source>Strictly Hierarchical Pyramid</source>
+ <translation>金字塔严格的级别制度</translation>
+ </message>
+ <message>
+ <location line="-325"/>
+ <source>Partition Search</source>
+ <translation>画分搜寻</translation>
+ </message>
+ <message>
+ <location line="+1885"/>
+ <source>Slice-based Threading</source>
+ <translation>切割基本线程</translation>
+ </message>
+ <message>
+ <location line="-731"/>
+ <source>Average Bitrate Tolerance:</source>
+ <translation>平均比特率误差(ABR)</translation>
+ </message>
+ <message>
+ <location line="-2550"/>
+ <source>Configuration:</source>
+ <translation>配置:</translation>
+ </message>
+ <message>
+ <location line="+1030"/>
+ <source>Subpixel Refinement</source>
+ <translation>次像素精细化(次ME)</translation>
+ </message>
+ <message>
+ <location line="+2734"/>
+ <source>Transfer Characteristics:</source>
+ <translation>转移特性：</translation>
+ </message>
+ <message>
+ <location line="-1679"/>
+ <source>Psychovisual Rate Distortion Optimisation:</source>
+ <translation>心理视觉优化(Psy RDO)：</translation>
+ </message>
+ <message>
+ <location line="+1478"/>
+ <source>Video Usability Information</source>
+ <translation>视频可用性信息</translation>
+ </message>
+ <message>
+ <location line="-3196"/>
+ <source>Constant Rate Factor (Single Pass)</source>
+ <translation>恒定速率系数(CRF)(1通)</translation>
+ </message>
+ <message>
+ <location line="+439"/>
+ <source>Frametype Lookahead:</source>
+ <translation>帧类型预测先行:</translation>
+ </message>
+ <message>
+ <location line="+2895"/>
+ <source>Colour Primaries:</source>
+ <translation>基色 :</translation>
+ </message>
+ <message>
+ <location line="-3393"/>
+ <source>Threads </source>
+ <translation>线程</translation>
+ </message>
+ <message>
+ <location line="+3640"/>
+ <source>Chroma Sample Location:</source>
+ <translation>色度采样位置：</translation>
+ </message>
+ <message>
+ <location line="-1186"/>
+ <source>Reduce Fluctuation After Curve Compression:</source>
+ <translation>减少波动曲线压缩之后：</translation>
+ </message>
+ <message>
+ <location line="-459"/>
+ <source>Custom Matrix</source>
+ <translation>自定义矩阵</translation>
+ </message>
+</context>
+<context>
+ <name>x264CustomMatrixDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+2374"/>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <location line="-2314"/>
+ <location line="+446"/>
+ <location line="+446"/>
+ <location line="+703"/>
+ <source>Luma:</source>
+ <translation>Luma明度:</translation>
+ </message>
+ <message>
+ <location line="-1385"/>
+ <location line="+446"/>
+ <source>Chroma U/V:</source>
+ <translation>Chroma色度 U/V:</translation>
+ </message>
+ <message>
+ <location line="+1668"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <location line="-30"/>
+ <source>Load File</source>
+ <translation>加载文件</translation>
+ </message>
+ <message>
+ <location line="-2338"/>
+ <source>x264 Custom Matrix</source>
+ <translation>x264自定义矩阵</translation>
+ </message>
+ <message>
+ <location line="+462"/>
+ <source>Inter 4x4</source>
+ <translation>Inter内 4x4</translation>
+ </message>
+ <message>
+ <location line="+1149"/>
+ <source>Inter 8x8</source>
+ <translation>Inter内 8x8</translation>
+ </message>
+ <message>
+ <location line="-1595"/>
+ <source>Intra 4x4</source>
+ <translation>Intra内 4x4</translation>
+ </message>
+ <message>
+ <location line="+892"/>
+ <source>Intra 8x8</source>
+ <translation>Intra内 8x8</translation>
+ </message>
+</context>
+<context>
+ <name>x265</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+594"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="-410"/>
+ <source>none</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+568"/>
+ <location line="+69"/>
+ <location line="+14"/>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+ <translation>宏块优化需要平差自适应量化(AQ)来启用，将自动禁用宏块树优化，您要继续吗？</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Save Profile</source>
+ <translation>保存设置檔</translation>
+ </message>
+ <message>
+ <location line="-174"/>
+ <source>Target Video Size:</source>
+ <translation>目标视频大小:</translation>
+ </message>
+ <message>
+ <location line="+246"/>
+ <source>Do you really want to delete the </source>
+ <translation>你打算删除?</translation>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>Cannot load preset</source>
+ <translation>不能载入默认定</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <location line="-624"/>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <location line="+604"/>
+ <source>Cannot save preset</source>
+ <translation>无法保存默认定</translation>
+ </message>
+ <message>
+ <location line="-237"/>
+ <source>Quantiser:</source>
+ <translation>量化值:</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
+ <source>Not coded</source>
+ <translation>非码</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="-5"/>
+ <location line="+20"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
+ </message>
+ <message>
+ <location line="+213"/>
+ <source>Replace the following preset ?:</source>
+ <translation>要替代以下默认定?</translation>
+ </message>
+ <message>
+ <location line="-234"/>
+ <source>Target Bitrate:</source>
+ <translation>目标比特率：</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Average Bitrate:</source>
+ <translation>平均比特率(ABR):</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+0"/>
+ <source>this mode has not been implemented
+</source>
+ <translation>这种模式没有得到执行</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="-10"/>
+ <source>Quality:</source>
+ <translation>质量:</translation>
+ </message>
+ <message>
+ <location line="+247"/>
+ <source>Cannot delete custom profile</source>
+ <translation>不能删除自定义的设置檔</translation>
+ </message>
+ <message>
+ <location line="-23"/>
+ <source>Overwrite</source>
+ <translation>复写</translation>
+ </message>
+ <message>
+ <location line="-113"/>
+ <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"/>
+ <source>Delete preset</source>
+ <translation>删除默认定</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source> profile ?.
+If it is a system profile it will be recreated next time.</source>
+ <translation>设置檔 ?.
+ 如果它是一个系统设置文件，它将在下一次建立。</translation>
+ </message>
+</context>
+<context>
+ <name>x265ConfigDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+2123"/>
+ <location line="+168"/>
+ <location line="+302"/>
+ <source>%</source>
+ <translation>%</translation>
+ </message>
+ <message>
+ <location line="-1701"/>
+ <source>0</source>
+ <translation>0</translation>
+ </message>
+ <message>
+ <location line="-663"/>
+ <location line="+668"/>
+ <source>1</source>
+ <translation>1</translation>
+ </message>
+ <message>
+ <location line="-648"/>
+ <source>2</source>
+ <translation>2</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <location line="+638"/>
+ <source>3</source>
+ <translation>3</translation>
+ </message>
+ <message>
+ <location line="-623"/>
+ <source>4</source>
+ <translation>4</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>5</source>
+ <translation>5</translation>
+ </message>
+ <message>
+ <location line="+613"/>
+ <source>7</source>
+ <translation>7</translation>
+ </message>
+ <message>
+ <location line="+2156"/>
+ <source>:</source>
+ <translation>:</translation>
+ </message>
+ <message>
+ <location line="-2151"/>
+ <source>15</source>
+ <translation>15</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>31</source>
+ <translation>31</translation>
+ </message>
+ <message>
+ <location line="+1247"/>
+ <source>Cb</source>
+ <translation>Cb</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Cr</source>
+ <translation>Cr</translation>
+ </message>
+ <message>
+ <location line="-1724"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="-229"/>
+ <source>1.1</source>
+ <translation>1.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>1.2</source>
+ <translation>1.2</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>1.3</source>
+ <translation>1.3</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>2.1</source>
+ <translation>2.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>2.2</source>
+ <translation>2.2</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>3.1</source>
+ <translation>3.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>3.2</source>
+ <translation>3.2</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>4.1</source>
+ <translation>4.1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>4.2</source>
+ <translation>4.2</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>5.1</source>
+ <translation>5.1</translation>
+ </message>
+ <message>
+ <location line="+927"/>
+ <source>Constrained Intra Prediction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+618"/>
+ <source>Noise Reduction:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+85"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+933"/>
+ <source>Custom:</source>
+ <comment>multithreading</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+674"/>
+ <source>CBR</source>
+ <translation>CBR</translation>
+ </message>
+ <message>
+ <location line="-749"/>
+ <source>Add</source>
+ <translation>加入</translation>
+ </message>
+ <message>
+ <location line="+681"/>
+ <source>FCC</source>
+ <translation>FCC</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>GBR</source>
+ <translation>GBR</translation>
+ </message>
+ <message>
+ <location line="-199"/>
+ <source>MAC</source>
+ <translation>MAC</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>PAL</source>
+ <translation>PAL逐行倒相</translation>
+ </message>
+ <message>
+ <location line="+257"/>
+ <source>VBR</source>
+ <translation>可变比特率(VBR)</translation>
+ </message>
+ <message>
+ <location line="-3307"/>
+ <source>Auto</source>
+ <translation>自动</translation>
+ </message>
+ <message>
+ <location line="+3004"/>
+ <source>Crop</source>
+ <translation>剪切</translation>
+ </message>
+ <message>
+ <location line="-1252"/>
+ <location line="+818"/>
+ <source>Edit</source>
+ <translation>编辑</translation>
+ </message>
+ <message>
+ <location line="-1291"/>
+ <source>Fast</source>
+ <translation>快</translation>
+ </message>
+ <message>
+ <location line="+1849"/>
+ <source>Film</source>
+ <translation>电影</translation>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>NTSC</source>
+ <translation>NTSC国家电视系统委员会</translation>
+ </message>
+ <message>
+ <location line="+247"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="-303"/>
+ <source>Show</source>
+ <translation>慢</translation>
+ </message>
+ <message>
+ <location line="-664"/>
+ <source>kbit</source>
+ <translation>kbit</translation>
+ </message>
+ <message>
+ <location line="+768"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT709</source>
+ <translation>BT709</translation>
+ </message>
+ <message>
+ <location line="-3352"/>
+ <source>Basic</source>
+ <translation>基本</translation>
+ </message>
+ <message>
+ <location line="+1186"/>
+ <source>Frame</source>
+ <translation>帧</translation>
+ </message>
+ <message>
+ <location line="+326"/>
+ <source>Minimum:</source>
+ <translation>最小 :</translation>
+ </message>
+ <message>
+ <location line="+1661"/>
+ <source>SECAM</source>
+ <translation>SECAM顺序彩色与记忆</translation>
+ </message>
+ <message>
+ <location line="+209"/>
+ <source>YCgCo</source>
+ <translation>YCgCo</translation>
+ </message>
+ <message>
+ <location line="-726"/>
+ <source>Zones</source>
+ <translation>缓冲区</translation>
+ </message>
+ <message>
+ <location line="-58"/>
+ <source>Maximum Macroblocks per Slice:</source>
+ <translation>切割每帧最大宏块</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>bytes</source>
+ <translation>比特</translation>
+ </message>
+ <message>
+ <location line="-1852"/>
+ <source>Coding Unit-tree Rate Control</source>
+ <translation>单位码-树速率控制</translation>
+ </message>
+ <message>
+ <location line="+410"/>
+ <location line="+217"/>
+ <location line="+36"/>
+ <source>Disabled</source>
+ <translation>禁用</translation>
+ </message>
+ <message>
+ <location line="+1682"/>
+ <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
+ <translation>这些设置只是建议播放设备，使用您自担风险。</translation>
+ </message>
+ <message>
+ <location line="-534"/>
+ <source>VBV Buffer Size:</source>
+ <translation>VBV 缓冲容量 :</translation>
+ </message>
+ <message>
+ <location line="-1411"/>
+ <source>Weighted Prediction for P-frames:</source>
+ <translation>P-帧的加权预测</translation>
+ </message>
+ <message>
+ <location line="+910"/>
+ <source>Maximum Quantiser Step:</source>
+ <translation>最大量化步骤:</translation>
+ </message>
+ <message>
+ <location line="+526"/>
+ <source>Maximum Size per Slice:</source>
+ <translation>切割每帧最大容量</translation>
+ </message>
+ <message>
+ <location line="-264"/>
+ <source>Variance AQ:</source>
+ <translation>可变 AQ:</translation>
+ </message>
+ <message>
+ <location line="-1736"/>
+ <source>Advanced Rate Control</source>
+ <translation>高级速率控制(RC)</translation>
+ </message>
+ <message>
+ <location line="+2580"/>
+ <source>Video Format:</source>
+ <translation>视频格式:</translation>
+ </message>
+ <message>
+ <location line="-2085"/>
+ <source>Motion Vector</source>
+ <translation>向量运动</translation>
+ </message>
+ <message>
+ <location line="-763"/>
+ <source>Constant Quantiser (Single Pass)</source>
+ <translation>恒定量化器(QP)(1通)</translation>
+ </message>
+ <message>
+ <location line="+1662"/>
+ <source>I and P-frame Quantiser Ratio:</source>
+ <translation>P:I , P-帧量化率:</translation>
+ </message>
+ <message>
+ <location line="+834"/>
+ <source>Enforce Repeatability</source>
+ <translation>强制回放</translation>
+ </message>
+ <message>
+ <location line="-690"/>
+ <source>P and B-frame Quantiser Ratio:</source>
+ <translation>B:P , B-帧量化率:</translation>
+ </message>
+ <message>
+ <location line="-595"/>
+ <source>GOP Size:</source>
+ <translation>GOP(图像群组) 大小:</translation>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>B-frame Bias:</source>
+ <translation>B-帧偏移：</translation>
+ </message>
+ <message>
+ <location line="-591"/>
+ <source>Hexagonal Search</source>
+ <translation>六角形搜寻</translation>
+ </message>
+ <message>
+ <location line="-368"/>
+ <source>Use Strict Constant Bitrate Mode</source>
+ <translation>使用严格固定比特率模式(CBR)</translation>
+ </message>
+ <message>
+ <location line="-238"/>
+ <source>Target Video Size:</source>
+ <translation>目标视频大小</translation>
+ </message>
+ <message>
+ <location line="+703"/>
+ <source>7 (Best)</source>
+ <translation>7 (最好)</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>1 (Fast)</source>
+ <translation>1 (快)</translation>
+ </message>
+ <message>
+ <location line="+424"/>
+ <source>Non-strict (Not Blu-ray Compatible)</source>
+ <translation>非严格（不与Blu-ray蓝光相容）</translation>
+ </message>
+ <message>
+ <location line="+551"/>
+ <source>Quantiser Control</source>
+ <translation>量化控制</translation>
+ </message>
+ <message>
+ <location line="-1605"/>
+ <source>Average Bitrate (Two Pass)</source>
+ <translation>平均比特率(ABR)(2通)</translation>
+ </message>
+ <message>
+ <location line="+1846"/>
+ <source>Quantiser Curve Compression</source>
+ <translation>量化曲线压缩(QCComp)</translation>
+ </message>
+ <message>
+ <location line="-658"/>
+ <source>I-frames</source>
+ <translation>I-帧(内帧,前帧)</translation>
+ </message>
+ <message>
+ <location line="-160"/>
+ <source>B-frames</source>
+ <translation>B-帧 (介于前I帧与后P帧间连续预测帧，例如: IBBBPBBBPBBBPBBBIBBBP....)</translation>
+ </message>
+ <message>
+ <location line="+1404"/>
+ <source>Auto-detect</source>
+ <translation>自动侦测</translation>
+ </message>
+ <message>
+ <location line="-1254"/>
+ <source>Adaptive B-frame Decision:</source>
+ <translation>自适应 B 帧的决定：</translation>
+ </message>
+ <message>
+ <location line="-224"/>
+ <source>Top Field First</source>
+ <translation>顶部首先字段</translation>
+ </message>
+ <message>
+ <location line="+383"/>
+ <source>Trellis Quantization:</source>
+ <translation>网格量化:</translation>
+ </message>
+ <message>
+ <location line="+562"/>
+ <source>Reduce Fluctuation Before Curve Compression:</source>
+ <translation>减少波动曲线压缩之前：</translation>
+ </message>
+ <message>
+ <location line="+952"/>
+ <source>Component</source>
+ <translation>合成的</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <location line="+63"/>
+ <source>BT470M</source>
+ <translation>BT470M</translation>
+ </message>
+ <message>
+ <location line="-1654"/>
+ <location line="+6"/>
+ <source>Analysis</source>
+ <translation>分析</translation>
+ </message>
+ <message>
+ <location line="-1070"/>
+ <source>Maximum Constant Rate Factor</source>
+ <translation>最大恒定速率系数(CRF)</translation>
+ </message>
+ <message>
+ <location line="+2158"/>
+ <source>Multithreading</source>
+ <translation>多线程</translation>
+ </message>
+ <message>
+ <location line="-2772"/>
+ <location line="+2738"/>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <location line="+297"/>
+ <source>Predefined Aspect Ratio:</source>
+ <translation>预定义PAR:</translation>
+ </message>
+ <message>
+ <location line="-2102"/>
+ <source>Uneven Multi-hexagonal Search</source>
+ <translation>六边形搜索</translation>
+ </message>
+ <message>
+ <location line="-331"/>
+ <source>Advanced RC</source>
+ <translation>高级速率控制(RC)</translation>
+ </message>
+ <message>
+ <location line="+590"/>
+ <source>Weighted References + Duplicates</source>
+ <translation>加权参考 + 重复项</translation>
+ </message>
+ <message>
+ <location line="+2155"/>
+ <source>LOG100</source>
+ <translation>LOG100</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>LOG316</source>
+ <translation>LOG316</translation>
+ </message>
+ <message>
+ <location line="-1384"/>
+ <source>Chroma to Luma Quantiser Offset:</source>
+ <translation>从色度明度量化偏移量:</translation>
+ </message>
+ <message>
+ <location line="-1840"/>
+ <source>IDC Level:</source>
+ <translation>IDC级别 :</translation>
+ </message>
+ <message>
+ <location line="+3214"/>
+ <source>Linear</source>
+ <translation>线性</translation>
+ </message>
+ <message>
+ <location line="-1448"/>
+ <source>JVT Matrix</source>
+ <translation>JVT 矩阵</translation>
+ </message>
+ <message>
+ <location line="-998"/>
+ <source>Motion</source>
+ <translation>运动</translation>
+ </message>
+ <message>
+ <location line="+2055"/>
+ <source>As Input</source>
+ <translation>另输出为其他输入档(保留原始视频的PAR)</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Generate Access Unit Delimiters</source>
+ <translation>生成存取单元分隔符</translation>
+ </message>
+ <message>
+ <location line="-566"/>
+ <source>Normal</source>
+ <translation>一般</translation>
+ </message>
+ <message>
+ <location line="+560"/>
+ <source>Output</source>
+ <translation>输出</translation>
+ </message>
+ <message>
+ <location line="-1033"/>
+ <source>Flat Matrix</source>
+ <translation>平面矩阵</translation>
+ </message>
+ <message>
+ <location line="+1400"/>
+ <location line="+78"/>
+ <location line="+58"/>
+ <source>SMPTE240M</source>
+ <translation>SMPTE240M</translation>
+ </message>
+ <message>
+ <location line="-141"/>
+ <location line="+136"/>
+ <source>SMPTE170M</source>
+ <translation>SMPTE170M</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>HRD Parameters:</source>
+ <translation>HRD 参数：</translation>
+ </message>
+ <message>
+ <location line="-3009"/>
+ <location line="+213"/>
+ <source>0 (High Quality)</source>
+ <translation>0 (高质量)</translation>
+ </message>
+ <message>
+ <location line="+732"/>
+ <source>B-frames as References:</source>
+ <translation>B帧作为参考</translation>
+ </message>
+ <message>
+ <location line="+1996"/>
+ <source>Colour Matrix:</source>
+ <translation>颜色矩阵：</translation>
+ </message>
+ <message>
+ <location line="-3050"/>
+ <source>Constant Bitrate (Single Pass)</source>
+ <translation>固定比特率(CBR)(1通)</translation>
+ </message>
+ <message>
+ <location line="+603"/>
+ <source>Star Search</source>
+ <translation>开始搜寻</translation>
+ </message>
+ <message>
+ <location line="+2591"/>
+ <source>Full Range Samples</source>
+ <translation>全范围色度样品</translation>
+ </message>
+ <message>
+ <location line="-1653"/>
+ <source>Quantisation Matrix</source>
+ <translation>量化矩阵</translation>
+ </message>
+ <message>
+ <location line="-58"/>
+ <source>Noise Reduction Intra:</source>
+ <translation>在内部减少噪声：</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Noise Reduction Inter:</source>
+ <translation>在之间减少噪声：</translation>
+ </message>
+ <message>
+ <location line="-1342"/>
+ <location line="+213"/>
+ <source>51 (Low Quality)</source>
+ <translation>51 (低质量)</translation>
+ </message>
+ <message>
+ <location line="+742"/>
+ <source>Optimal</source>
+ <translation>优化</translation>
+ </message>
+ <message>
+ <location line="-650"/>
+ <location line="+2077"/>
+ <source>frames</source>
+ <translation>帧</translation>
+ </message>
+ <message>
+ <location line="-1169"/>
+ <source>Final Macroblock Only</source>
+ <translation>最终的宏块(更快，中等质量)</translation>
+ </message>
+ <message>
+ <location line="-1430"/>
+ <source>Frame Threads </source>
+ <translation>帧线程</translation>
+ </message>
+ <message>
+ <location line="+883"/>
+ <source>Weighted Prediction for B-frames</source>
+ <translation>B-帧的加权预测</translation>
+ </message>
+ <message>
+ <location line="+1206"/>
+ <source>Auto Variance AQ</source>
+ <translation>自动变量 AQ:</translation>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
+ </message>
+ <message>
+ <location line="-81"/>
+ <source>Initial VBV Buffer Occupancy:</source>
+ <translation>初始 VBV 缓冲区占用：</translation>
+ </message>
+ <message>
+ <location line="+794"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT470BG</source>
+ <translation>BT470BG</translation>
+ </message>
+ <message>
+ <location line="-3340"/>
+ <source>Preset:</source>
+ <translation>默认定:</translation>
+ </message>
+ <message>
+ <location line="+2863"/>
+ <source>Pixel Aspect Ratio</source>
+ <translation>像素宽高比(PAR)-(不同于外观比的显示宽高比(DAR))</translation>
+ </message>
+ <message>
+ <location line="-1202"/>
+ <source>Fast Skip Detection on P-frames</source>
+ <translation>快速跳过检测 P-帧 (场景中如有虚影时按取消)</translation>
+ </message>
+ <message>
+ <location line="-463"/>
+ <source>Normal Mode</source>
+ <translation>正常模式</translation>
+ </message>
+ <message>
+ <location line="+1185"/>
+ <source>Advanced 1</source>
+ <translation>高级 : 1</translation>
+ </message>
+ <message>
+ <location line="+313"/>
+ <source>Advanced 2</source>
+ <translation>高级 2</translation>
+ </message>
+ <message>
+ <location line="-2299"/>
+ <location line="+213"/>
+ <location line="+1274"/>
+ <source>Quantiser</source>
+ <translation>量化器</translation>
+ </message>
+ <message>
+ <location line="+1403"/>
+ <source>SMPTEL170M</source>
+ <translation>SMPTEL170M</translation>
+ </message>
+ <message>
+ <location line="-309"/>
+ <source>16:15 (PAL 4:3)</source>
+ <translation>16:15 (PAL 4:3)</translation>
+ </message>
+ <message>
+ <location line="-2229"/>
+ <source>Sequence Parameter Set Identifer:</source>
+ <translation>序列参数集的标识符：</translation>
+ </message>
+ <message>
+ <location line="+1569"/>
+ <source>Strength:</source>
+ <translation>强度 :</translation>
+ </message>
+ <message>
+ <location line="+213"/>
+ <source>Slices per Frame:</source>
+ <translation>切割每帧:</translation>
+ </message>
+ <message>
+ <location line="-2338"/>
+ <source>Pool Threads </source>
+ <translation>共享线程</translation>
+ </message>
+ <message>
+ <location line="+1330"/>
+ <source>Maximum:</source>
+ <translation>最大 :</translation>
+ </message>
+ <message>
+ <location line="+616"/>
+ <source>Quantiser Curve Compression:</source>
+ <translation>量化曲线压缩(QCComp)</translation>
+ </message>
+ <message>
+ <location line="+844"/>
+ <source>64:45 (PAL 16:9)</source>
+ <translation>64:45 (PAL 16:9)</translation>
+ </message>
+ <message>
+ <location line="-2990"/>
+ <source>Profile:</source>
+ <translation>设置檔</translation>
+ </message>
+ <message>
+ <location line="+1233"/>
+ <source>Interlaced:</source>
+ <translation>纯交错模式:</translation>
+ </message>
+ <message>
+ <location line="-353"/>
+ <source>Exhaustive Search</source>
+ <translation>Hadamard彻底搜寻（TESA）</translation>
+ </message>
+ <message>
+ <location line="-950"/>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
+ </message>
+ <message>
+ <location line="+1145"/>
+ <source>Maximum Motion Vector Search Range:</source>
+ <translation>最大向量运动搜寻范围:</translation>
+ </message>
+ <message>
+ <location line="+108"/>
+ <source>Loop Filter:</source>
+ <translation>循环或循环过滤器：</translation>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>Maximum Reference Frames:</source>
+ <translation>最大参考帧数</translation>
+ </message>
+ <message>
+ <location line="-421"/>
+ <source>Diamond Search</source>
+ <translation>菱形搜寻</translation>
+ </message>
+ <message>
+ <location line="+1672"/>
+ <source>Slicing</source>
+ <translation>切割</translation>
+ </message>
+ <message>
+ <location line="-2643"/>
+ <source>x265 Configuraton</source>
+ <translation>x265 配置</translation>
+ </message>
+ <message>
+ <location line="+1235"/>
+ <source>Weighted References</source>
+ <translation>加权参考</translation>
+ </message>
+ <message>
+ <location line="-285"/>
+ <source>Motion Estimation</source>
+ <translation>运动估计</translation>
+ </message>
+ <message>
+ <location line="+1563"/>
+ <source>Video Buffer Verifier</source>
+ <translation>视频缓冲验证器(VBV)</translation>
+ </message>
+ <message>
+ <location line="+690"/>
+ <location line="+46"/>
+ <location line="+58"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>Undefined</source>
+ <translation>未定义</translation>
+ </message>
+ <message>
+ <source>Custom:</source>
+ <translation type="vanished">自定义:</translation>
+ </message>
+ <message>
+ <location line="-337"/>
+ <source>8:9 (NTSC 4:3)</source>
+ <translation>8:9 (NTSC 4:3)</translation>
+ </message>
+ <message>
+ <location line="-1908"/>
+ <source>Prediction</source>
+ <translation>预测</translation>
+ </message>
+ <message>
+ <location line="+1630"/>
+ <source>Disable</source>
+ <translation>禁用</translation>
+ </message>
+ <message>
+ <location line="-1155"/>
+ <source>I-frame Threshold:</source>
+ <translation>I-帧线程:</translation>
+ </message>
+ <message>
+ <location line="+1316"/>
+ <source>Custom:</source>
+ <comment>PAR</comment>
+ <translatorcomment>PAR</translatorcomment>
+ <translation>自定义:</translation>
+ </message>
+ <message>
+ <location line="-1203"/>
+ <source>DCT Decimation on P-frames</source>
+ <translation>DCT 抽取对P帧</translation>
+ </message>
+ <message>
+ <location line="-1617"/>
+ <source>Tuning:</source>
+ <translation>调音:</translation>
+ </message>
+ <message>
+ <location line="+789"/>
+ <source>Motion Estimation Method:</source>
+ <translation>运动估计方法:</translation>
+ </message>
+ <message>
+ <location line="-560"/>
+ <source>Video Size (Two Pass)</source>
+ <translation>视频大小(2通)</translation>
+ </message>
+ <message>
+ <location line="-296"/>
+ <source>Use advanced configuration</source>
+ <translation>使用高级配置</translation>
+ </message>
+ <message>
+ <location line="+1201"/>
+ <source>Open GOP:</source>
+ <translation>开启 GOP(图像群组):</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Frame Encoding</source>
+ <translation>帧编码</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Blu-ray Mode</source>
+ <translation>Blu-ray 模式</translation>
+ </message>
+ <message>
+ <location line="+1790"/>
+ <source>32:27 (NTSC 16:9)</source>
+ <translation>2:27 (NTSC 16:9)</translation>
+ </message>
+ <message>
+ <location line="-1537"/>
+ <source>Maximum Consecutive B-frames:</source>
+ <translation>最大连续 B-帧：</translation>
+ </message>
+ <message>
+ <location line="+1619"/>
+ <source>Overscan:</source>
+ <translation>过度字段</translation>
+ </message>
+ <message>
+ <location line="-234"/>
+ <source>Output 1</source>
+ <translation>输出 1</translation>
+ </message>
+ <message>
+ <location line="+194"/>
+ <source>Output 2</source>
+ <translation>输出 2</translation>
+ </message>
+ <message>
+ <location line="-769"/>
+ <source>Adaptive Quantisation</source>
+ <translation>自适应量化(AQ)</translation>
+ </message>
+ <message>
+ <location line="-628"/>
+ <source>Always On</source>
+ <translation>始终在(缓慢，质量最好)</translation>
+ </message>
+ <message>
+ <location line="-394"/>
+ <source>Bottom Field First</source>
+ <translation>底部首先字段</translation>
+ </message>
+ <message>
+ <location line="-1272"/>
+ <source>General</source>
+ <translation>一般</translation>
+ </message>
+ <message>
+ <location line="+2810"/>
+ <source>Custom Threaded Lookahead Buffer:</source>
+ <translation>自定义线程预测先行缓冲区：</translation>
+ </message>
+ <message>
+ <location line="-2551"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
+ </message>
+ <message>
+ <location line="+2172"/>
+ <source>Maximum VBV Bitrate:</source>
+ <translation>最大 VBV 比特率 :</translation>
+ </message>
+ <message>
+ <location line="-2095"/>
+ <source>Encoding Mode:</source>
+ <translation>编码模式:</translation>
+ </message>
+ <message>
+ <location line="+1026"/>
+ <source>Strictly Hierarchical Pyramid</source>
+ <translation>金字塔严格的级别制度</translation>
+ </message>
+ <message>
+ <location line="+1439"/>
+ <source>Slice-based Threading</source>
+ <translation>切割基本线程</translation>
+ </message>
+ <message>
+ <location line="-690"/>
+ <source>Average Bitrate Tolerance:</source>
+ <translation>平均比特率误差(ABR)</translation>
+ </message>
+ <message>
+ <location line="-2177"/>
+ <source>Configuration:</source>
+ <translation>配置:</translation>
+ </message>
+ <message>
+ <location line="+1029"/>
+ <source>Subpixel Refinement</source>
+ <translation>次像素精细化(次ME)</translation>
+ </message>
+ <message>
+ <location line="+2307"/>
+ <source>Transfer Characteristics:</source>
+ <translation>转移特性：</translation>
+ </message>
+ <message>
+ <location line="-1565"/>
+ <source>Psychovisual Rate Distortion Optimisation:</source>
+ <translation>心理视觉优化(Psy RDO)：</translation>
+ </message>
+ <message>
+ <location line="+1364"/>
+ <source>Video Usability Information</source>
+ <translation>视频可用性信息</translation>
+ </message>
+ <message>
+ <location line="-2766"/>
+ <source>Constant Rate Factor (Single Pass)</source>
+ <translation>恒定速率系数(CRF)(1通)</translation>
+ </message>
+ <message>
+ <location line="+436"/>
+ <source>Frametype Lookahead:</source>
+ <translation>帧类型预测先行:</translation>
+ </message>
+ <message>
+ <location line="+2468"/>
+ <source>Colour Primaries:</source>
+ <translation>基色 :</translation>
+ </message>
+ <message>
+ <location line="+247"/>
+ <source>Chroma Sample Location:</source>
+ <translation>色度采样位置：</translation>
+ </message>
+ <message>
+ <location line="-1172"/>
+ <source>Reduce Fluctuation After Curve Compression:</source>
+ <translation>减少波动曲线压缩之后：</translation>
+ </message>
+ <message>
+ <location line="-421"/>
+ <source>Custom Matrix</source>
+ <translation>自定义矩阵</translation>
+ </message>
+</context>
+<context>
+ <name>x265CustomMatrixDialog</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+2372"/>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <location line="-2314"/>
+ <location line="+446"/>
+ <location line="+446"/>
+ <location line="+703"/>
+ <source>Luma:</source>
+ <translation>明度:</translation>
+ </message>
+ <message>
+ <location line="-1385"/>
+ <location line="+446"/>
+ <source>Chroma U/V:</source>
+ <translation>色度 U/V:</translation>
+ </message>
+ <message>
+ <location line="+1668"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <location line="-30"/>
+ <source>Load File</source>
+ <translation>加载文件</translation>
+ </message>
+ <message>
+ <location line="-2338"/>
+ <source>x265 Custom Matrix</source>
+ <translation>x265 自定义矩阵</translation>
+ </message>
+ <message>
+ <location line="+462"/>
+ <source>Inter 4x4</source>
+ <translation>Intra内 4x4</translation>
+ </message>
+ <message>
+ <location line="+1149"/>
+ <source>Inter 8x8</source>
+ <translation>Intra内 8x8</translation>
+ </message>
+ <message>
+ <location line="-1595"/>
+ <source>Intra 4x4</source>
+ <translation>Intra内 4x4</translation>
+ </message>
+ <message>
+ <location line="+892"/>
+ <source>Intra 8x8</source>
+ <translation>Intra内 8x8</translation>
+ </message>
+</context>
+<context>
+ <name>xvid4</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+71"/>
+ <source>Three threads</source>
+ <translation>三个线程</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>DCT</source>
+ <translation>DCT</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Low</source>
+ <translation>低</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Full</source>
+ <translation>全部</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <location line="+24"/>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>_Trellis quantization</source>
+ <translation>_网格量化</translation>
+ </message>
+ <message>
+ <location line="-52"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Qpel8</source>
+ <translation>Qpel8</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>MotionEstimation</source>
+ <translation>运动估计</translation>
+ </message>
+ <message>
+ <location line="+66"/>
+ <source>Xvid4 MPEG-4 ASP configuration</source>
+ <translation>Xvid4 MPEG-4 ASP配置</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop大小：</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>4:3 (NTSC)</source>
+ <translation>4:3 (NTSC)</translation>
+ </message>
+ <message>
+ <location line="+67"/>
+ <source>Aspect Ratio</source>
+ <translation>像素比例</translation>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Auto (#cpu)</source>
+ <translation>自动 (#cpu)</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>16:9 (NTSC)</source>
+ <translation>16:9 (NTSC)</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>4:3 (PAL)</source>
+ <translation>4:3 (PAL)</translation>
+ </message>
+ <message>
+ <location line="-38"/>
+ <source>Medium</source>
+ <translation>中</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Qpel16</source>
+ <translation>Qpel16</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Square</source>
+ <translation>正方形</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>_Quantization type:</source>
+ <translation>量化型式:</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>One thread</source>
+ <translation>一个线程</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Threading</source>
+ <translation>线程</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>_Number of B frames:</source>
+ <translation>B帧的数量</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Profile:</source>
+ <translation>设置檔:</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>Two threads)</source>
+ <translation>两个线程</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Motion Estimation</source>
+ <translation>运动估计</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Threads</source>
+ <translation>线程</translation>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>16:9 (PAL)</source>
+ <translation>16:9 (PAL)</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Advanced Simple Profile</source>
+ <translation>高级简单的设置檔</translation>
+ </message>
+ <message>
+ <location line="-19"/>
+ <source>_Macroblock decision:</source>
+ <translation>_宏块决定:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Aspect Ratio:</source>
+ <translation>像素比例(PAR):</translation>
+ </message>
+ <message>
+ <location line="-29"/>
+ <source>1:1 (PC)</source>
+ <translation>1:1 (PC)</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Use XVID fcc (else DIVX)</source>
+ <translation>使用 XVID fcc (其他 DIVX)</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Rate Control</source>
+ <translation>比率控制</translation>
+ </message>
+ <message>
+ <location line="-58"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大.量化器</translation>
+ </message>
+</context>
+<context>
+ <name>yadif</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <source>Yadif</source>
+ <translation>2.1-亚迪夫(yadif)过滤器</translation>
+ </message>
+ <message>
+ <location line="+69"/>
+ <source>yadif</source>
+ <translation>yadif</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Top field first</source>
+ <translation>顶部首先字段</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>_Order:</source>
+ <translation>_命令:</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
+ </message>
+ <message>
+ <location line="-63"/>
+ <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>时间 &amp; 空间检查</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Bob, temporal &amp; spatial check</source>
+ <translation>振动，时间 &amp; 空间检查</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Bob, skip spatial temporal check</source>
+ <translation>振动，略过空间时间检查</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Skip spatial temporal check</source>
+ <translation>略过空间时间检查</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Bottom field first</source>
+ <translation>底部首先字段</translation>
+ </message>
+</context>
+</TS>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts -> avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts Changed

@@ -1,15148 +1,8900 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_TW" sourcelanguage="zh_TW">
+<TS version="2.1" language="zh_TW">
 <context>
- <name></name>
- <message>
- <source>Stereo</source>
- <translation type="obsolete">立體聲</translation>
- </message>
- <message>
- <source>Joint stereo</source>
- <translation type="obsolete">聯合立體聲</translation>
- </message>
+ <name>ADM_Composer</name>
 <message>
- <source>Mono</source>
- <translation type="obsolete">單音</translation>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+59"/>
+ <source>Checking if timestamps are valid..</source>
+ <translation>檢查時間戳記是否有效。</translation>
 </message>
 <message>
- <source>C_hannel mode:</source>
- <translation type="obsolete">聲道模式(_H):</translation>
+ <location line="+26"/>
+ <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>
 <message>
- <source>CBR</source>
- <translation type="obsolete">CBR</translation>
+ <location line="+31"/>
+ <source>Decoding video...</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>ABR</source>
- <translation type="obsolete">ABR</translation>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+ <source>Attempt to open %s failed!</source>
+ <translation>嘗試開啟 %s 失敗!</translation>
 </message>
 <message>
- <source>Extreme</source>
- <translation type="obsolete">極致</translation>
+ <location line="+22"/>
+ <source>width</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Bit_rate mode:</source>
- <translation type="obsolete">位元率模式(_R):</translation>
+ <location line="+6"/>
+ <source>%sheight</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Bitrate:</source>
- <translation type="obsolete">位元率(_B):</translation>
+ <location line="+1"/>
+ <source> and </source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Quality:</source>
- <translation type="obsolete">品質(_Q):</translation>
+ <location line="+3"/>
+ <source>%sdifferent between first and this video stream</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Disable reservoir</source>
- <translation type="obsolete">停用儲存槽(_D)</translation>
+ <location line="+1"/>
+ <source> are </source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>LAME Configuration</source>
- <translation type="obsolete">LAME 設定</translation>
+ <location line="+0"/>
+ <source> is </source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>VBR</source>
- <translation type="obsolete">VBR</translation>
+ <location line="+2"/>
+ <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
+1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
+2.) concatenate them together</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Quality based</source>
- <translation type="obsolete">基本品質</translation>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+115"/>
+ <source>Some timing information are incorrect.
+It happens with some capture software.
+If you re encode video we should drop these informations,
+ else it will cause dropped frame/jerky video.
+If you just copy the video without reencoding,
+ you should keep them.
+Drop timing informations ?</source>
+ <translation>一些計時資訊不正確。
+ 它會發生某些捕獲軟體。
+ 如果你對影片進行編碼我們應該放下這些資訊，
+ 否則它將導致出現掉落幀/生澀視頻。
+ 如果你只是複製視頻沒有重新編碼，
+ 你應該維持它們的定時資訊？
+</translation>
 </message>
 <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
+ <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-71"/>
+ <source>Cannot find a demuxer for %s</source>
+ <translation>找不到為分離器 %s</translation>
 </message>
+</context>
+<context>
+ <name>CalculatorDialog</name>
 <message>
- <source>Vorbis Configuration</source>
- <translation type="obsolete">Vorbis 設定</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+398"/>
+ <location line="+27"/>
+ <location line="+34"/>
+ <location line="+68"/>
+ <location line="+18"/>
+ <source>0</source>
+ <translation>0</translation>
 </message>
 <message>
- <source>Codec Error</source>
- <translation type="obsolete">編解碼器錯誤</translation>
+ <location line="-335"/>
+ <location line="+198"/>
+ <location line="+27"/>
+ <location line="+34"/>
+ <source>MB</source>
+ <translation>MB</translation>
 </message>
 <message>
- <source>The number of channels is greater than what the selected audio codec can do.
-Either change codec or use the mixer filter to have less channels.</source>
- <translation type="obsolete">聲道數大於什麼選擇的音訊編解碼器可執行。
-改變編解碼器或使用混合式的濾鏡來擁有較少的聲道。</translation>
+ <location line="+163"/>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
 <message>
- <source>Avidemux detected VBR MP3 audio in this file. For keeping audio/video in sync, time map is needed. Build it now?
-
-You can do it later with &quot;Audio -&gt; Build VBR Time Map&quot;.</source>
- <translation type="obsolete">Avidemux 偵測到這個檔案含有 VBR MP3 音訊。為了維持影音同步，時間對應是必須的。現在建立嗎？
-
-你可以稍候透過 \&quot;音訊 -&gt; 建立 VBR 時間對應\&quot; 來建立。</translation>
+ <location line="-568"/>
+ <source>AVI</source>
+ <translation>AVI</translation>
 </message>
 <message>
- <source>AVI</source>
- <translation type="obsolete">AVI</translation>
+ <location line="+5"/>
+ <source>OGM</source>
+ <translation>OGM</translation>
 </message>
 <message>
- <source>AVI, dual audio</source>
- <translation type="obsolete">AVI, 雙語</translation>
+ <location line="+5"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
 </message>
 <message>
- <source>AVI, pack VOP</source>
- <translation type="obsolete">AVI, 打包好的 VOP</translation>
+ <location line="+212"/>
+ <location line="+37"/>
+ <location line="+232"/>
+ <source>kbps</source>
+ <translation>kbps</translation>
 </message>
 <message>
- <source>AVI, unpack VOP</source>
- <translation type="obsolete">AVI, 拆開打包 VOP</translation>
+ <location line="-431"/>
+ <source>DVD-5</source>
+ <translation>DVD-5</translation>
 </message>
 <message>
- <source>MPEG-PS (A+V)</source>
- <translation type="obsolete">MPEG-PS (A+V)</translation>
+ <location line="+259"/>
+ <source>Video Size:</source>
+ <translation>影片大小:</translation>
 </message>
 <message>
- <source>MPEG-TS (A+V)</source>
- <translation type="obsolete">MPEG-TS (A+V)</translation>
+ <location line="-7"/>
+ <source>Audio Size:</source>
+ <translation>音訊大小:</translation>
 </message>
 <message>
- <source>MPEG video</source>
- <translation type="obsolete">MPEG 影片</translation>
+ <location line="-124"/>
+ <source>Audio Bitrate</source>
+ <translation>音訊位元率</translation>
 </message>
 <message>
- <source>MP4</source>
- <translation type="obsolete">MP4</translation>
+ <location line="-170"/>
+ <source>Medium:</source>
+ <translation>媒體:</translation>
 </message>
 <message>
- <source>MP4 (PSP)</source>
- <translation type="obsolete">MP4 (PSP)</translation>
+ <location line="-26"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
 </message>
 <message>
- <source>OGM</source>
- <translation type="obsolete">OGM</translation>
+ <location line="+583"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <source>FLV</source>
- <translation type="obsolete">FLV</translation>
+ <location line="-510"/>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <source>MKV</source>
- <translation type="obsolete">MKV</translation>
+ <location line="+219"/>
+ <source>Result</source>
+ <translation>結果</translation>
 </message>
 <message>
- <source>DUMMY</source>
- <translation type="obsolete">虛擬</translation>
+ <location line="-320"/>
+ <source>Target</source>
+ <translation>目標</translation>
 </message>
 <message>
- <source>YV12 (raw)</source>
- <translation type="obsolete">YV12 (raw)</translation>
+ <location line="+86"/>
+ <source>1 x 74 minute CD</source>
+ <translation>1 x 74 分鐘 CD</translation>
 </message>
 <message>
- <source>MPEG-2 requant</source>
- <translation type="obsolete">MPEG-2 requant</translation>
+ <location line="+5"/>
+ <source>2 x 74 minute CD</source>
+ <translation>2 x 74 分鐘 CD</translation>
 </message>
 <message>
- <source>dummy</source>
- <translation type="obsolete">虛擬</translation>
+ <location line="-15"/>
+ <source>1 x 80 minute CD</source>
+ <translation>1 x 80 分鐘 CD</translation>
 </message>
 <message>
- <source>Copy</source>
- <translation type="obsolete">複製</translation>
+ <location line="+5"/>
+ <source>2 x 80 minute CD</source>
+ <translation>2 x 80 分鐘 CD</translation>
 </message>
 <message>
- <source>Crop</source>
- <translation type="obsolete">剪裁</translation>
+ <location line="+200"/>
+ <source>Track 2:</source>
+ <translation>軌道 2:</translation>
 </message>
 <message>
- <source>Remove lines from top/bottom/left/right.</source>
- <translation type="obsolete">由頂部/底部/左側/右側移除線。</translation>
+ <location line="-37"/>
+ <source>Track 1:</source>
+ <translation>軌道 1:</translation>
 </message>
 <message>
- <source>MPlayer resize</source>
- <translation type="obsolete">MPlayer 調整大小</translation>
+ <location line="-176"/>
+ <source>Duration:</source>
+ <translation>持續時間:</translation>
 </message>
 <message>
- <source>Change image size. Faster than Avisynth&apos;s Resize.</source>
- <translation type="obsolete">改變圖像大小。比 Avisynth 的調整大小快。</translation>
+ <location line="-80"/>
+ <source>Calculator</source>
+ <translation>計算機</translation>
 </message>
 <message>
- <source>Resize</source>
- <translation type="obsolete">調整大小</translation>
+ <location line="+171"/>
+ <source>Custom Size:</source>
+ <translation>自訂大小:</translation>
 </message>
 <message>
- <source>Add black borders</source>
- <translation type="obsolete">加框</translation>
+ <location line="-98"/>
+ <source>Format:</source>
+ <translation>格式:</translation>
 </message>
 <message>
- <source>Blacken borders</source>
- <translation type="obsolete">邊框填黑</translation>
+ <location line="+355"/>
+ <source>Total Size:</source>
+ <translation>總大小:</translation>
 </message>
 <message>
- <source>Fill borders with pure black. Doesn&apos;t alter size.</source>
- <translation type="obsolete">用黑色填入邊框。不變更大小。</translation>
+ <location line="+120"/>
+ <source>Bits Per Pixel:</source>
+ <translation>每像素位元數:</translation>
 </message>
 <message>
- <source>Vertical flip</source>
- <translation type="obsolete">垂直翻轉</translation>
+ <location line="+7"/>
+ <source>Video Bitrate:</source>
+ <translation>影片位元率:</translation>
 </message>
+</context>
+<context>
+ <name>Dialog</name>
 <message>
- <source>Vertically flip the picture.</source>
- <translation type="obsolete">垂直翻轉圖像。</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+66"/>
+ <source># Images :</source>
+ <translation># 圖像 :</translation>
 </message>
 <message>
- <source>Rotate</source>
- <translation type="obsolete">旋轉</translation>
+ <location line="-2"/>
+ <source>Indexing</source>
+ <translation>正在索引</translation>
 </message>
 <message>
- <source>Rotate the picture by 90, 180 or 270 degrees.</source>
- <translation type="obsolete">旋轉圖像 90、180 或 270 度。</translation>
+ <location line="+1"/>
+ <source>Time Left : Infinity</source>
+ <translation>剩下時間： 無限</translation>
 </message>
+</context>
+<context>
+ <name>DialogAudioTracks</name>
 <message>
- <source>Resample fps</source>
- <translation type="obsolete">重複取樣 fps</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="+48"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <source>Configure</source>
+ <translation>配置</translation>
 </message>
 <message>
- <source>Change framerate while keeping duration.</source>
- <translation type="obsolete">維持連續時間時改變畫格率。</translation>
+ <location line="-157"/>
+ <source>Audio Tracks Configuration</source>
+ <translation>音訊軌配置</translation>
 </message>
 <message>
- <source>Reverse</source>
- <translation type="obsolete">反向</translation>
+ <location line="+11"/>
+ <source>Track 1</source>
+ <translation>軌道 1</translation>
 </message>
 <message>
- <source>Play video backward.</source>
- <translation type="obsolete">倒帶播放影片。</translation>
+ <location line="+41"/>
+ <source>Track 2</source>
+ <translation>軌道 2:</translation>
 </message>
 <message>
- <source>Fade</source>
- <translation type="obsolete">淡化</translation>
+ <location line="+41"/>
+ <source>Track 3</source>
+ <translation>軌道 3:</translation>
 </message>
 <message>
- <source>Fade in/out.</source>
- <translation type="obsolete">淡入/出。</translation>
+ <location line="+41"/>
+ <source>Track 4</source>
+ <translation>軌道 4:</translation>
 </message>
 <message>
- <source>yadif</source>
- <translation type="obsolete">yadif</translation>
+ <location line="-116"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <source>Enabled</source>
+ <translation>啟用</translation>
 </message>
 <message>
- <source>Yet Another DeInterlacer. Ported from MPlayer.</source>
- <translation type="obsolete">另一個去交錯器。從 MPlayer 移植而來。</translation>
+ <location line="-100"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <location line="+41"/>
+ <source>Filters</source>
+ <translation>濾鏡器</translation>
 </message>
+</context>
+<context>
+ <name>DialogOcr</name>
 <message>
- <source>mcDeinterlace</source>
- <translation type="obsolete">mcDeinterlace</translation>
+ <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+74"/>
+ <source>Ok</source>
+ <translation>確定</translation>
 </message>
 <message>
- <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
- <translation type="obsolete">從 MPlayer 移植的動作補償去交錯器。</translation>
+ <location line="+42"/>
+ <source>0/0</source>
+ <translation>0/0</translation>
 </message>
 <message>
- <source>Deinterlace</source>
- <translation type="obsolete">Deinterlace</translation>
+ <location line="-24"/>
+ <source>Close</source>
+ <translation>關閉</translation>
 </message>
 <message>
- <source>Mask interlacing artifacts. Port of Smart deinterlace.</source>
- <translation type="obsolete">從智慧型去交錯移植的遮罩交錯加工。</translation>
+ <location line="-52"/>
+ <source>Skip All</source>
+ <translation>略過全部</translation>
 </message>
 <message>
- <source>KernelDeint</source>
- <translation type="obsolete">KernelDeint</translation>
+ <location line="+7"/>
+ <source>Skip Glyph</source>
+ <translation>略過字形</translation>
 </message>
 <message>
- <source>Kernel deinterlacer by Donald Graft.</source>
- <translation type="obsolete">內核去交錯器，作者為 Donald Graft。</translation>
+ <location line="-14"/>
+ <source>Calibrate</source>
+ <translation>校準</translation>
 </message>
 <message>
- <source>TDeint</source>
- <translation type="obsolete">TDeint</translation>
+ <location line="+90"/>
+ <source>Nb Lines :</source>
+ <translation>線的數目 :</translation>
 </message>
 <message>
- <source>Motion adaptative deinterlacer by Tritical.</source>
- <translation type="obsolete">動作適應去交錯器，作者為 Tritical。</translation>
+ <location line="-14"/>
+ <source>Timecode:</source>
+ <translation>時間碼:</translation>
 </message>
 <message>
- <source>libavcodec deinterlacer</source>
- <translation type="obsolete">libavcodec 去交錯器</translation>
+ <location line="-96"/>
+ <source>Dialog</source>
+ <translation>對話窗</translation>
 </message>
 <message>
- <source>All FFmpeg deinterlace filters (bicubic, median, ...).</source>
- <translation type="obsolete">全部 FFmpeg 去交錯濾鏡 (雙立方、中位數、...)。</translation>
+ <location line="+41"/>
+ <source>Ignore</source>
+ <translation>忽略</translation>
 </message>
 <message>
- <source>Decomb Telecide</source>
- <translation type="obsolete">去除梳形雜訊電視電影</translation>
+ <location line="+48"/>
+ <source>00:00:00/000</source>
+ <translation>00:00:00/000</translation>
 </message>
+</context>
+<context>
+ <name>DialogProcessing</name>
 <message>
- <source>Great deinterlacing package including IVTC.</source>
- <translation type="obsolete">生成包含 IVTC 的去交錯套件。</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+81"/>
+ <source>0</source>
+ <translation>0</translation>
 </message>
 <message>
- <source>Decomb Decimate</source>
- <translation type="obsolete">Decomb 成批編碼器</translation>
+ <location line="+14"/>
+ <source>0 fps</source>
+ <translation>0 fps</translation>
 </message>
 <message>
- <source>Useful to remove dupes left by Telecide.</source>
- <translation type="obsolete">電視電影用於移除偽裝左面。</translation>
+ <location line="-55"/>
+ <source>TimeLeft</source>
+ <translation>剩餘時間</translation>
 </message>
 <message>
- <source>Pulldown</source>
- <translation type="obsolete">Pulldown</translation>
+ <location line="+48"/>
+ <source>Speed</source>
+ <translation>速率</translation>
 </message>
 <message>
- <source>Convert 24 fps to 30 fps by repeating fields.</source>
- <translation type="obsolete">用重複圖場來將 24 fps 轉成 30 fps。</translation>
+ <location line="-34"/>
+ <source>ProcessImages</source>
+ <translation>程序圖像</translation>
 </message>
 <message>
- <source>PAL field shift</source>
- <translation type="obsolete">PAL 圖場位移</translation>
+ <location line="-7"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
 </message>
 <message>
- <source>Shift fields by one. Useful for some PAL movies.</source>
- <translation type="obsolete">根據一個圖場來移動圖場。用於一些 PAL 電影。</translation>
+ <location line="-14"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <source>PAL smart</source>
- <translation type="obsolete">PAL 智慧型</translation>
+ <location line="-19"/>
+ <source>Dialog</source>
+ <translation>對話窗</translation>
 </message>
+</context>
+<context>
+ <name>DialogProgress</name>
 <message>
- <source>Smartly revert non constant PAL field shift.</source>
- <translation type="obsolete">自動恢復非固定的 PAL 圖場移動。</translation>
+ <location filename="../ADM_jobs/src/uiProgress.ui" line="+51"/>
+ <source>...</source>
+ <translation>...</translation>
 </message>
 <message>
- <source>Drop</source>
- <translation type="obsolete">降低</translation>
+ <location line="-14"/>
+ <source>1/1</source>
+ <translation>1/1</translation>
 </message>
 <message>
- <source>Drop damaged fields (e.g. from VHS capture).</source>
- <translation type="obsolete">降低損壞的圖場 (例如：由 VHS 抓取)。</translation>
+ <location line="+7"/>
+ <source>File being written </source>
+ <translation>檔案正被寫入</translation>
 </message>
 <message>
- <source>Swap fields</source>
- <translation type="obsolete">置換圖場</translation>
+ <location line="-27"/>
+ <source>Progress</source>
+ <translation>程式</translation>
 </message>
 <message>
- <source>Swap top and bottom fields.</source>
- <translation type="obsolete">置換圖場的頂部和底部。</translation>
+ <location line="+13"/>
+ <source>Current job</source>
+ <translation>目前工作</translation>
 </message>
+</context>
+<context>
+ <name>FDK-AAC</name>
 <message>
- <source>Smart swap fields</source>
- <translation type="obsolete">智慧型替換圖場</translation>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+434"/>
+ <location line="+9"/>
+ <source>_Bitrate:</source>
+ <translatorcomment>NO Display</translatorcomment>
+ <translation>_位元率：</translation>
 </message>
 <message>
- <source>Smartly swap fields. Needed when field order changes.</source>
- <translation type="obsolete">當圖場次序需要改變時自動置換圖場。</translation>
+ <location line="-6"/>
+ <location line="+7"/>
+ <source>After burner</source>
+ <translation>後燃器</translation>
 </message>
 <message>
- <source>Keep even fields</source>
- <translation type="obsolete">保留偶數圖場</translation>
+ <location line="-3"/>
+ <location line="+5"/>
+ <source>FDK-AAC Configuration</source>
+ <translation>FDK-AAC 配置</translation>
 </message>
 <message>
- <source>Keep odd fields</source>
- <translation type="obsolete">保留奇數圖場</translation>
+ <location line="-13"/>
+ <source>_Profile::</source>
+ <translation>_設定檔:</translation>
 </message>
 <message>
- <source>Each field becomes full picture, half sized.</source>
- <translation type="obsolete">每個圖場變為完整圖像，只有原來一半的大小。</translation>
+ <location line="+3"/>
+ <source>SBR enabled</source>
+ <translation>SBR 啟用</translation>
 </message>
+</context>
+<context>
+ <name>MainWindow</name>
 <message>
- <source>Merge fields</source>
- <translation type="obsolete">合併圖場</translation>
+ <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1399"/>
+ <source>?</source>
+ <translation>?</translation>
 </message>
 <message>
- <source>Merge two pictures as if they were two fields.</source>
- <translation type="obsolete">合併兩個圖像就像是兩個圖場一樣。</translation>
+ <location line="+111"/>
+ <source>A:</source>
+ <translation>A:</translation>
 </message>
 <message>
- <source>Stack fields</source>
- <translation type="obsolete">堆疊圖場</translation>
+ <location line="+7"/>
+ <source>B:</source>
+ <translation>B:</translation>
 </message>
 <message>
- <source>Put two fields on top of one another.</source>
- <translation type="obsolete">把兩個圖場放在另一個上。</translation>
+ <location line="+272"/>
+ <source>F7</source>
+ <translation>F7</translation>
 </message>
 <message>
- <source>Unstack fields</source>
- <translation type="obsolete">非堆疊圖場</translation>
+ <location line="-1043"/>
+ <source>ms</source>
+ <translation>ms</translation>
 </message>
 <message>
- <source>Interleave top and bottom part of the picture.</source>
- <translation type="obsolete">讓圖像的頂部和底部交錯。</translation>
+ <location line="-585"/>
+ <source>&amp;Go</source>
+ <translation>&amp;前往</translation>
 </message>
 <message>
- <source>MPlayer eq2</source>
- <translation type="obsolete">MPlayer eq2</translation>
+ <location line="+818"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+341"/>
+ <source>...</source>
+ <translation>...</translation>
 </message>
 <message>
- <source>Adjust contrast, brightness, saturation and gamma.</source>
- <translation type="obsolete">調整對比、亮度、飽和度和伽馬。</translation>
+ <location line="+308"/>
+ <source>&amp;Top</source>
+ <translation>&amp;上下並排</translation>
 </message>
 <message>
- <source>MPlayer hue</source>
- <translation type="obsolete">MPlayer 色相</translation>
+ <location line="-1425"/>
+ <location line="+169"/>
+ <source>Copy</source>
+ <translatorcomment>NO Display</translatorcomment>
+ <translation type="unfinished">複製</translation>
 </message>
 <message>
- <source>Adjust hue and saturation.</source>
- <translation type="obsolete">調整色相和飽和度。</translation>
+ <location line="+319"/>
+ <source>Play</source>
+ <translation>播放</translation>
 </message>
 <message>
- <source>Contrast</source>
- <translation type="obsolete">對比</translation>
+ <location line="-638"/>
+ <location line="+7"/>
+ <source>XXXX</source>
+ <translation>XXXX</translation>
 </message>
 <message>
- <source>Adjust contrast, brightness and colors.</source>
- <translation type="obsolete">調整對比、亮度和色彩。</translation>
+ <location line="-191"/>
+ <source>&amp;Auto</source>
+ <translation>&amp;自動</translation>
 </message>
 <message>
- <source>Luma equalizer</source>
- <translation type="obsolete">明度量化</translation>
+ <location line="-21"/>
+ <source>&amp;Edit</source>
+ <translation>&amp;編輯</translation>
 </message>
 <message>
- <source>Luma correction filter with histogram.</source>
- <translation type="obsolete">分佈圖校正明度濾鏡。</translation>
+ <location line="+46"/>
+ <source>&amp;File</source>
+ <translation>&amp;檔案</translation>
 </message>
 <message>
- <source>Swap U and V</source>
- <translation type="obsolete">置換 U 和 V</translation>
+ <location line="-56"/>
+ <source>&amp;Help</source>
+ <translation>&amp;說明</translation>
 </message>
 <message>
- <source>Invert chroma U and chroma V.</source>
- <translation type="obsolete">反相 U 和 V 的色度。</translation>
+ <location line="+15"/>
+ <source>&amp;View</source>
+ <translation>&amp;檢視</translation>
 </message>
 <message>
- <source>Chroma shift</source>
- <translation type="obsolete">色度變化</translation>
+ <location line="+1573"/>
+ <source>Open Video</source>
+ <translation>開啟影片</translation>
 </message>
 <message>
- <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
- <translation type="obsolete">改變色度 U/V 來修復糟糕的明度/色度同步。</translation>
+ <location line="+214"/>
+ <source>Si&amp;de</source>
+ <translation>左右&amp;並排</translation>
 </message>
 <message>
- <source>Luma only</source>
- <translation type="obsolete">只有明度</translation>
+ <location line="-606"/>
+ <source>Time:</source>
+ <translation>時間:</translation>
 </message>
 <message>
- <source>Convert picture to greyscale (black and white).</source>
- <translation type="obsolete">轉換圖片為灰階 (黑色和白色)。</translation>
+ <location line="+404"/>
+ <source>Alt+Return</source>
+ <translation>Alt+Return</translation>
 </message>
 <message>
- <source>Luma delta</source>
- <translation type="obsolete">明度差值</translation>
+ <location line="+39"/>
+ <location line="+3"/>
+ <source>Load/Run Project</source>
+ <translation>載入/執行專案</translation>
 </message>
 <message>
- <source>Difference between current and previous picture.</source>
- <translation type="obsolete">目前圖片與上一個圖片之間的差異。</translation>
+ <location line="-599"/>
+ <source>Search next black frame</source>
+ <translation>搜尋下一幀黑框</translation>
 </message>
 <message>
- <source>Avisynth ColorYUV</source>
- <translation type="obsolete">Avisynth ColorYUV</translation>
+ <location line="+23"/>
+ <source>Go to first frame [HOME]</source>
+ <translation>轉到第一幀 [HOME]</translation>
 </message>
 <message>
- <source>Alter colors (auto white balance etc...). Ported from Avisynth.</source>
- <translation type="obsolete">變更色彩 (自動白平衡等...)。從 Avisynth 移植而來。</translation>
+ <location line="-118"/>
+ <source>Go to next keyframe [UP]</source>
+ <translation>轉到下一幀(關鍵幀或I幀) [UP]</translation>
 </message>
 <message>
- <source>MPlayer denoise3d</source>
- <translation type="obsolete">MPlayer denoise3d</translation>
+ <location line="+718"/>
+ <source>&amp;Calculator...</source>
+ <translation>&amp;計算機...</translation>
 </message>
 <message>
- <source>Reduce noise, smooth image, increase compressibility.</source>
- <translation type="obsolete">減少雜訊、平滑圖像、增加壓縮率。</translation>
+ <location line="-262"/>
+ <source>Go to marker A [PAGE UP]</source>
+ <translation>轉到標記 A [PAGE UP]</translation>
 </message>
 <message>
- <source>MPlayer hqdn3d</source>
- <translation type="obsolete">MPlayer hqdn3d</translation>
+ <location line="+250"/>
+ <location line="+3"/>
+ <source>Save Project</source>
+ <translation>儲存專案</translation>
 </message>
 <message>
- <source>High quality version of denoise3d. Slower but more precise.</source>
- <translation type="obsolete">denoise3d 的高品質版本。 較慢但更精確。</translation>
+ <source>Display output video on playback</source>
+ <translation type="vanished">顯示輸出影片播放</translation>
 </message>
 <message>
- <source>FluxSmooth</source>
- <translation type="obsolete">融熔平滑</translation>
+ <location line="-1606"/>
+ <source>&amp;Audio</source>
+ <translation>&amp;音訊</translation>
 </message>
 <message>
- <source>Spatio-temporal cleaner by Ross Thomas.</source>
- <translation type="obsolete">空間-時間清理器，作者為 Ross Thomas。</translation>
+ <location line="+1633"/>
+ <source>&amp;Input</source>
+ <translation>&amp;輸入</translation>
 </message>
 <message>
- <source>Temporal Cleaner</source>
- <translation type="obsolete">時間清理器</translation>
+ <location line="+51"/>
+ <source>&amp;Selection</source>
+ <translatorcomment>NO Display</translatorcomment>
+ <translation type="unfinished">&amp;標誌區段</translation>
 </message>
 <message>
- <source>Vlad59&apos;s Avisynth port of Jim Casaburi&apos;s denoiser.</source>
- <translation type="obsolete">Vlad59 的 Avisynth 是從 Jim Casaburi 的去雜訊器移植而來。</translation>
+ <location line="-1689"/>
+ <source>&amp;Tools</source>
+ <translation>&amp;工具</translation>
 </message>
 <message>
- <source>Denoise</source>
- <translation type="obsolete">去雜訊</translation>
+ <location line="+1271"/>
+ <source>Se&amp;lection</source>
+ <translation>標誌&amp;區間段</translation>
 </message>
 <message>
- <source>Port of Transcode DNR.</source>
- <translation type="obsolete">從 DNR 轉碼移植而來。</translation>
+ <location line="-323"/>
+ <source>Set end marker [CTRL+PAGEDOWN]</source>
+ <translation>設定結束標記 [CTRL+PAGEDOWN]</translation>
 </message>
 <message>
- <source>Light denoiser.</source>
- <translation type="obsolete">明亮去雜訊器。</translation>
+ <location line="+413"/>
+ <location line="+10"/>
+ <source>000000</source>
+ <translation>000000</translation>
 </message>
 <message>
- <source>Cnr2</source>
- <translation type="obsolete">Cnr2</translation>
+ <location line="+346"/>
+ <source>&amp;Audio Metre</source>
+ <translation>&amp;音訊畫面</translation>
 </message>
 <message>
- <source>MSmooth by Donald Graft</source>
- <translation type="obsolete">MSmooth 平滑，作者為 Donald Graft</translation>
+ <location line="-1523"/>
+ <location line="+142"/>
+ <location line="+169"/>
+ <location line="+181"/>
+ <source>Configure</source>
+ <translation>配置</translation>
 </message>
 <message>
- <source>Smooth the image, don&apos;t blur edges. Useful on anime.</source>
- <translation type="obsolete">平滑此圖像但不模糊邊緣。用於動畫上。</translation>
+ <location line="-283"/>
+ <source> (0 track(s))</source>
+ <translation> (0 軌k(s))</translation>
 </message>
 <message>
- <source>Soften</source>
- <translation type="obsolete">柔化</translation>
+ <location line="-444"/>
+ <source>Vi&amp;deo</source>
+ <translation>影&amp;片</translation>
 </message>
 <message>
- <source>A variant of stabilize.</source>
- <translation type="obsolete">穩定的一個變體。</translation>
+ <location line="+845"/>
+ <source>Play [SPACE]</source>
+ <translation>播放 [SPACE]</translation>
 </message>
 <message>
- <source>Sharpen</source>
- <translation type="obsolete">銳利化</translation>
+ <location line="+694"/>
+ <source>Audio &amp;Metre</source>
+ <translation>音訊 &amp;畫面</translation>
 </message>
 <message>
- <source>Enhance difference between near pixels.</source>
- <translation type="obsolete">加強像素間的差異。</translation>
+ <location line="-1525"/>
+ <source>&amp;Toolbars</source>
+ <translation>&amp;工具列</translation>
 </message>
 <message>
- <source>MSharpen</source>
- <translation type="obsolete">MSharpen</translation>
+ <location line="+1566"/>
+ <source>&amp;Open...</source>
+ <translation>&amp;開啟檔案...</translation>
 </message>
 <message>
- <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
- <translation type="obsolete">沒有放大雜訊下銳利化邊緣。作者為 Donald Graft。</translation>
+ <location line="-319"/>
+ <source>Frame type:</source>
+ <translation>幀類型:</translation>
 </message>
 <message>
- <source>asharp</source>
- <translation type="obsolete">asharp</translation>
+ <location line="+346"/>
+ <location line="+3"/>
+ <source>Save Video</source>
+ <translation>儲存影片</translation>
 </message>
 <message>
- <source>Adaptative sharpener by MarcFD.</source>
- <translation type="obsolete">適性銳利化器，作者為 MarcFD。</translation>
+ <location line="-6"/>
+ <source>Save &amp;Video...</source>
+ <translation>儲存&amp;影片...</translation>
 </message>
 <message>
- <source>Gauss smooth</source>
- <translation type="obsolete">高斯平滑</translation>
+ <location line="-589"/>
+ <source>Search previous black frame</source>
+ <translation>搜尋上一幀黑框</translation>
 </message>
 <message>
- <source>Gaussian smooth. Blur the picture.</source>
- <translation type="obsolete">高斯平滑。模糊圖片。</translation>
+ <location line="-141"/>
+ <source>Go to previous frame [LEFT]</source>
+ <translation>轉到上一幀 [LEFT]</translation>
 </message>
 <message>
- <source>Mean</source>
- <translation type="obsolete">平均</translation>
+ <location line="-772"/>
+ <source>Codec O&amp;ptions</source>
+ <translation>編解碼器&amp;選項</translation>
 </message>
 <message>
- <source>Mean (blur) kernel.</source>
- <translation type="obsolete">平均(模糊)內核。</translation>
+ <location line="+1520"/>
+ <source>Play filtered</source>
+ <translation>濾鏡播放</translation>
 </message>
 <message>
- <source>Median</source>
- <translation type="obsolete">中位數</translation>
+ <location line="-213"/>
+ <source>Go to Marker B [PAGE DOWN]</source>
+ <translation>轉到標記 B [PAGE DOWN]</translation>
 </message>
 <message>
- <source>Median kernel 3x3. Remove high frequency noise.</source>
- <translation type="obsolete">中位數內核 3x3。移除高頻率雜訊。</translation>
+ <location line="-975"/>
+ <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
+ <translation>&lt;b&gt;輸出音訊編碼佳AC3/Mp3&lt;/b&gt;</translation>
 </message>
 <message>
- <source>Median (5x5)</source>
- <translation type="obsolete">中位數 (5x5)</translation>
+ <location line="+222"/>
+ <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
+ <translation>&lt;b&gt;影片輸出格式(容器)佳Mp4/Mkv&lt;/b&gt;</translation>
 </message>
 <message>
- <source>Median kernel 5x5. Good for reducing chroma noise.</source>
- <translation type="obsolete">中位數內核 5x5。可有效減少色度雜訊。</translation>
+ <location line="+975"/>
+ <source>&amp;Load/Run Project...</source>
+ <translation>&amp;載入/執行專案...</translation>
 </message>
 <message>
- <source>Forced postprocessing</source>
- <translation type="obsolete">強制性後置處理</translation>
+ <location line="-547"/>
+ <source>Go to last frame [END]</source>
+ <translation>G轉到最後一幀 [END]</translation>
 </message>
 <message>
- <source>Subtitler</source>
- <translation type="obsolete">Subtitler</translation>
+ <location line="-1053"/>
+ <source>&amp;Custom</source>
+ <translation>&amp;自訂</translation>
 </message>
 <message>
- <source>Add srt/sub subtitles to the picture.</source>
- <translation type="obsolete">加入 srt/sub 字幕到影片。</translation>
+ <location line="+1660"/>
+ <source>&amp;Output</source>
+ <translation>&amp;輸出</translation>
 </message>
 <message>
- <source>ASS</source>
- <translation type="obsolete">ASS</translation>
+ <location line="-1635"/>
+ <source>&amp;Recent</source>
+ <translation>&amp;最近</translation>
 </message>
 <message>
- <source>Add ASS/SSA subtitles to the picture.</source>
- <translation type="obsolete">加入 ASS/SSA 字幕到影片。</translation>
+ <location line="+1077"/>
+ <source>Forward one minute</source>
+ <translation>前進一分鐘 </translation>
 </message>
 <message>
- <source>VobSub</source>
- <translation type="obsolete">VobSub</translation>
+ <location line="-544"/>
+ <source>&amp;Shift:</source>
+ <translation>&amp;位移(±):</translation>
 </message>
 <message>
- <source>Embed VobSub subtitles into picture.</source>
- <translation type="obsolete">嵌入 VobSub 字幕到影片中。</translation>
+ <location line="+1155"/>
+ <source>&amp;Volume</source>
+ <translation>&amp;音量</translation>
 </message>
 <message>
- <source>DVB sub</source>
- <translation type="obsolete">DVB sub</translation>
+ <location line="-42"/>
+ <source>&amp;Codec Options</source>
+ <translation>&amp;編解碼器選項</translation>
 </message>
 <message>
- <source>Embed DVB-T subtitle.</source>
- <translation type="obsolete">嵌入 DVB-T 字幕。</translation>
+ <location line="-572"/>
+ <source>Forward one minute [CTRL+UP]</source>
+ <translation>前進一分鐘 [CTRL+UP]</translation>
 </message>
 <message>
- <source>Hard pulldown removal</source>
- <translation type="obsolete">硬式去除 Pulldown</translation>
+ <location line="+643"/>
+ <source>&amp;Separate</source>
+ <translation>&amp;分離視窗</translation>
 </message>
 <message>
- <source>Remove IVTC that has been analog captured or resized.</source>
- <translation type="obsolete">移除 IVTC 來模擬捕捉或調整大小。</translation>
+ <location line="-807"/>
+ <source>Set start marker [CTRL+PAGEUP]</source>
+ <translation>設定開始標記 [CTRL+PAGEUP]</translation>
 </message>
 <message>
- <source>Whirl</source>
- <translation type="obsolete">漩渦</translation>
+ <location line="-1076"/>
+ <source>Avidemux</source>
+ <translation>Avidemux</translation>
 </message>
 <message>
- <source>Useless whirlwind effect.</source>
- <translation type="obsolete">無用的旋風效果。</translation>
+ <location line="+503"/>
+ <location line="+169"/>
+ <source>Filters</source>
+ <translation>濾鏡器-特效</translation>
 </message>
 <message>
- <source>Split the picture into tiny thumbnails.</source>
- <translation type="obsolete">將圖像分割成一堆微小的圖片。</translation>
+ <location line="+888"/>
+ <source>Vol&amp;ume</source>
+ <translation>音&amp;量</translation>
 </message>
 <message>
- <source>MPlayer delogo</source>
- <translation type="obsolete">Mplayer 去圖標</translation>
+ <location line="-1315"/>
+ <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+ <translation>&lt;b&gt;解碼器.顏色.不編碼直選COPY&lt;/b&gt;</translation>
 </message>
 <message>
- <source>Blend a logo by interpolating its surrounding box.</source>
- <translation type="obsolete">利用插值它的包圍框來混合一個圖標。</translation>
+ <location line="+139"/>
+ <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
+ <translation>&lt;b&gt;輸出影片編碼佳x264/x265&lt;/b&gt;</translation>
 </message>
 <message>
- <source>Logo</source>
- <translation type="obsolete">圖標</translation>
+ <location line="+936"/>
+ <source>00:00:00.000</source>
+ <translation>00:00:00.000</translation>
 </message>
 <message>
- <source>Add a png as logo.</source>
- <translation type="obsolete">加入一個 png 作為圖標。</translation>
+ <location line="+22"/>
+ <source>/ 00:00:00.000</source>
+ <translation>/ 00:00:00.000</translation>
 </message>
 <message>
- <source>Animated Menu</source>
- <translation type="obsolete">動畫式選單</translation>
+ <location line="+193"/>
+ <source>Selection: 000000</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Create a video made of 6 mini windows, very useful to do DVD menus.</source>
- <translation type="obsolete">以 6 個小視窗建立一個影片，對於製作 DVD 選單非常有用。</translation>
+ <location line="+221"/>
+ <source>Save &amp;Project</source>
+ <translation>儲存&amp;專案</translation>
 </message>
 <message>
- <source>Compute Average</source>
- <translation type="obsolete">計算平均值</translation>
+ <location line="-54"/>
+ <source>&amp;Information...</source>
+ <translation>&amp;屬性...</translation>
 </message>
 <message>
- <source>Compute average luma value for each pixel throughout all frames, and save to file</source>
- <translation type="obsolete">計算重頭到尾所有畫格的每個像素的平均明度值，並且儲存到檔案</translation>
+ <location line="-695"/>
+ <source>Go to next frame [RIGHT]</source>
+ <translation>轉到下一幀</translation>
 </message>
 <message>
- <source>Eraser</source>
- <translation type="obsolete">擦除器</translation>
+ <location line="+210"/>
+ <source>Backward one minute [CTRL+DOWN]</source>
+ <translation>倒退一分鐘 [CTRL+DOWN]</translation>
 </message>
 <message>
- <source>&quot;Erase&quot; arbitrary areas of each frame</source>
- <translation type="obsolete">\&quot;擦除\&quot; 每個畫格的任意範圍</translation>
+ <source>&lt;b&gt;Video&lt;/b&gt;</source>
+ <translation type="vanished">&lt;b&gt;影片&lt;/b&gt;</translation>
 </message>
 <message>
- <source>Swiss Army Knife</source>
- <translation type="obsolete">瑞士軍刀</translation>
+ <location line="+598"/>
+ <source>Ctrl+Alt+C</source>
+ <translation>Ctrl+Alt+C</translation>
 </message>
 <message>
- <source>Apply operation like P&apos;=P*A, P-A, P+A, etc. using a convolution, rolling average, image from file, or constant</source>
- <translation type="obsolete">套用運算像 P&apos;=P*A, P-A, P+A 等。使用卷積、波動平均數、檔案的映像或常數</translation>
+ <location line="+56"/>
+ <source>Ctrl+Alt+M</source>
+ <translation>Ctrl+Alt+M</translation>
 </message>
 <message>
- <source>Threshold</source>
- <translation type="obsolete">臨界值</translation>
+ <location line="-42"/>
+ <source>Ctrl+Alt+N</source>
+ <translation>Ctrl+Alt+N</translation>
 </message>
 <message>
- <source>Force too-bright/too-dim pixels to 0 and the rest to 255 or vice-versa</source>
- <translation type="obsolete">強制 過亮/過暗 的像素為 0 且重新設定成 255 或者反過來</translation>
+ <location line="+14"/>
+ <source>Ctrl+Alt+S</source>
+ <translation>Ctrl+Alt+S</translation>
 </message>
 <message>
- <source>Particle List</source>
- <translation type="obsolete">區段列表</translation>
+ <location line="+14"/>
+ <source>Ctrl+Alt+V</source>
+ <translation>Ctrl+Alt+V</translation>
 </message>
 <message>
- <source>Identify &apos;particles&apos; (groups of pixels)</source>
- <translation type="obsolete">識別 &apos;區段&apos; (像素的群組)</translation>
+ <location line="-827"/>
+ <source>Go to previous keyframe [DOWN]</source>
+ <translation>轉到上一幀(關鍵幀或I幀) [DOWN]</translation>
 </message>
 <message>
- <source>Add Framenumber</source>
- <translation type="obsolete">加入畫格數目</translation>
+ <location line="-150"/>
+ <location line="+946"/>
+ <source>&amp;Navigation</source>
+ <translation>&amp;影片導航欄</translation>
 </message>
+</context>
+<context>
+ <name>Opus</name>
 <message>
- <source>Print frame number directly in image</source>
- <translation type="obsolete">直接將畫格數印在圖像上</translation>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+254"/>
+ <source>_Bitrate:</source>
+ <translation type="unfinished"></translation>
 </message>
+</context>
+<context>
+ <name>SpiderMonkeyShell</name>
 <message>
- <source>Partial</source>
- <translation type="obsolete">區段</translation>
+ <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+49"/>
+ <source>Clear</source>
+ <translation>清除</translation>
 </message>
 <message>
- <source>Problem reading XML filters</source>
- <translation type="obsolete">讀取 XML 濾鏡時發生問題</translation>
+ <location line="-32"/>
+ <source>Shell</source>
+ <translation>殼(Shell)</translation>
 </message>
 <message>
- <source>No filter found</source>
- <translation type="obsolete">沒有找到任何濾鏡</translation>
+ <location line="+75"/>
+ <source>Ctrl+Return</source>
+ <translation>Ctrl+Return</translation>
 </message>
 <message>
- <source>Could not find a filter</source>
- <translation type="obsolete">無法找到濾鏡</translation>
+ <location line="-3"/>
+ <source>Evaluate</source>
+ <translation>求值</translation>
 </message>
+</context>
+<context>
+ <name>VapourSynthProxy</name>
 <message>
- <source>No tag found</source>
- <translation type="obsolete">沒有找到任何標籤</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui" line="+37"/>
+ <source>Port to use: </source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Node not found</source>
- <translation type="obsolete">沒有找到節點</translation>
+ <location line="+24"/>
+ <source>...</source>
+ <translation>...</translation>
 </message>
 <message>
- <source>There is several mpeg file, append them ?</source>
- <translation type="obsolete">有一些 mpeg 檔，添加它們嗎?</translation>
+ <location line="+7"/>
+ <source>Run!</source>
+ <translation>執行!</translation>
 </message>
 <message>
- <source>Can&apos;t determine aspect ratio</source>
- <translation type="obsolete">無法決定外觀比列</translation>
+ <location line="-54"/>
+ <source>VapourSynth Proxy</source>
+ <translation>VapourSynth 代理</translation>
 </message>
 <message>
- <source>Wrong Colorspace</source>
- <translation type="obsolete">錯誤的色彩空間</translation>
+ <location line="+12"/>
+ <source>Select VS file</source>
+ <translation>選擇VS檔案</translation>
 </message>
+</context>
+<context>
+ <name>aboutDialog</name>
 <message>
- <source>Only YV12/I420 or YUY2/I422 JPegs are supported</source>
- <translation type="obsolete">只支援 YV12/I420 或 YUY2/I422 JPEG</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+220"/>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
 <message>
- <source>NTSC 4:3</source>
- <translation type="obsolete">NTSC 4:3</translation>
+ <source>© 2001 - 2017 Mean</source>
+ <translation type="vanished">© 2001 - 2017 Mean</translation>
 </message>
 <message>
- <source>NTSC 16:9</source>
- <translation type="obsolete">NTSC 16:9</translation>
+ <location line="-20"/>
+ <source>&amp;License</source>
+ <translation>&amp;授權</translation>
 </message>
 <message>
- <source>PAL 4:3</source>
- <translation type="obsolete">PAL 4:3</translation>
+ <location line="-186"/>
+ <source>About Avidemux</source>
+ <translation>關於 Avidemux</translation>
 </message>
 <message>
- <source>PAL 16:9</source>
- <translation type="obsolete">PAL 16:9</translation>
+ <location line="+112"/>
+ <source>Multi-platform Video Editor</source>
+ <translation>跨平台影片編輯工具
+
+ 繁體中文翻譯者:ziyawu(V2.4.4)/李新廠(V2.7.0)後製作
+ </translation>
 </message>
 <message>
- <source>1:1</source>
- <translation type="obsolete">1:1</translation>
+ <location line="+10"/>
+ <source>© 2001 - 2018 Mean</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Unknown</source>
- <translation type="obsolete">未知</translation>
+ <location line="+19"/>
+ <source>http://www.avidemux.org</source>
+ <translation>http://www.avidemux.org</translation>
 </message>
 <message>
- <source>Output file error</source>
- <translation type="obsolete">輸出檔案錯誤</translation>
+ <location line="-48"/>
+ <source>Avidemux </source>
+ <translation>Avidemux </translation>
 </message>
+</context>
+<context>
+ <name>addBorder</name>
 <message>
- <source>Could not open &quot;%s&quot; for writing.</source>
- <translation type="obsolete">無法開啟 &quot;%s&quot; 進行寫入。</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+184"/>
+ <source>_Right border:</source>
+ <translation>_右側邊界:</translation>
 </message>
 <message>
- <source>Input file error</source>
- <translation type="obsolete">輸入檔案錯誤</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+43"/>
+ <source>Add black borders around the image.</source>
+ <translation>增加圖片周圍的黑色邊框，圖片大小會再加雙邊尺寸</translation>
 </message>
 <message>
- <source>Unknown source type</source>
- <translation type="obsolete">未知的來源類型</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="-1"/>
+ <source>Add Borders</source>
+ <translation>1.3-加入外邊框-框厚必偶數值</translation>
 </message>
 <message>
- <source>Bitmap source failed</source>
- <translation type="obsolete">點陣圖來源失敗</translation>
+ <location line="+4"/>
+ <source>Incorrect parameters</source>
+ <translation>不正確的參數</translation>
 </message>
 <message>
- <source>Problem loading sub</source>
- <translation type="obsolete">載入 sub 時發生問題</translation>
+ <location line="-10"/>
+ <source>_Left border:</source>
+ <translation>_左側邊界:</translation>
 </message>
 <message>
- <source>No subs</source>
- <translation type="obsolete">沒有 sub</translation>
+ <location line="+10"/>
+ <source>All parameters must be even and within range.</source>
+ <translation>所有參數必須是偶數且在範圍內。</translation>
 </message>
 <message>
- <source>Ifo error</source>
- <translation type="obsolete">Ifo 錯誤</translation>
+ <location line="-8"/>
+ <source>_Top border:</source>
+ <translation>_頂部邊界:</translation>
 </message>
 <message>
- <source>Error reading ifo file, aborting.</source>
- <translation type="obsolete">讀取 ifo 檔案時發生錯誤，正在中止。</translation>
+ <location line="+1"/>
+ <source>_Bottom border:</source>
+ <translation>_底部邊界:</translation>
 </message>
+</context>
+<context>
+ <name>adm</name>
 <message>
- <source>Cannot write .idx</source>
- <translation type="obsolete">無法寫入 .idx</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
+ <location line="+2"/>
+ <location line="+2"/>
+ <source>-</source>
+ <translation>-</translation>
 </message>
 <message>
- <source>Cannot write .sub</source>
- <translation type="obsolete">無法寫入 .sub</translation>
+ <location filename="../../common/gui_save.cpp" line="+55"/>
+ <source>No</source>
+ <translation>否</translation>
 </message>
 <message>
- <source>Problem opening the mpeg files</source>
- <translation type="obsolete">開啟 mpeg 檔案時發生問題</translation>
+ <location line="+64"/>
+ <source>Select PNG to Save</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Generating VobSub file</source>
- <translation type="obsolete">正在生成 VobSub 檔</translation>
+ <location line="+282"/>
+ <source>Failed to save as JPEG</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not write the file</source>
- <translation type="obsolete">無法寫入檔案</translation>
+ <location line="+71"/>
+ <source>Saving selection as set of JPEG images</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>File error</source>
- <translation type="obsolete">檔案錯誤</translation>
+ <location line="+20"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Could not read &quot;%s&quot;.</source>
- <translation type="obsolete">無法讀取 &quot;%s&quot;。</translation>
+ <location line="+0"/>
+ <source>Maximum number of 9999 images reached, aborting.</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Load it</source>
- <translation type="obsolete">載入它</translation>
+ <location line="+8"/>
+ <source>Saving images failed.</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Crash file</source>
- <translation type="obsolete">損壞檔</translation>
+ <location line="+32"/>
+ <source>PNG</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>I have detected a crash file. 
-Do you want to load it ?
-(It will be deleted in all cases, you should save it if you want to keep it)</source>
- <translation type="obsolete">偵測到一個損壞檔。
-是否要載入 ?
-(在所有的案例都會偵測，若要保存它你必須執行儲存)</translation>
+ <location line="+0"/>
+ <source>Failed to save as PNG</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Oops</source>
- <translation type="obsolete">Oops</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+383"/>
+ <source>1:1</source>
+ <translation>1:1</translation>
 </message>
 <message>
- <source>Cannot open &quot;%s&quot;.</source>
- <translation type="obsolete">無法開啟 &quot;%s&quot;。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+54"/>
+ <source>5.1</source>
+ <translation>5.1</translation>
 </message>
 <message>
- <source>%s already exists.
-
-Do you want to replace it?</source>
- <translation type="obsolete">%s 已存在。
-
-要覆蓋它嗎?</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+74"/>
+ <source>4MV</source>
+ <translation>4MV</translation>
 </message>
 <message>
- <source>It is possible that you are trying to overwrite an input file!</source>
- <translation type="obsolete">你可能嘗試覆寫一個輸入檔!</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+223"/>
+ <source>AAC</source>
+ <translation>AAC</translation>
 </message>
 <message>
- <source>Cannot write the file</source>
- <translation type="obsolete">無法寫入檔案</translation>
+ <location line="-6"/>
+ <source>AC3</source>
+ <translation>AC3</translation>
 </message>
 <message>
- <source>No write access to &quot;%s&quot;.</source>
- <translation type="obsolete">沒有任何寫入動作存取到 &quot;%s&quot;。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+493"/>
+ <source>CPU</source>
+ <translation>CPU</translation>
 </message>
 <message>
- <source>Normal</source>
- <translation type="obsolete">一般</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+ <source>DRC</source>
+ <translation>DRC</translation>
 </message>
 <message>
- <source>Mux every N video frames</source>
- <translation type="obsolete">合成每個 N 視訊畫格</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-7"/>
+ <source>DTS</source>
+ <translation>DTS</translation>
 </message>
 <message>
- <source>Mux by packet size</source>
- <translation type="obsolete">利用分組尺寸來合成</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+21"/>
+ <source>Cut</source>
+ <translation>剪下</translation>
 </message>
 <message>
- <source>Muxing _type:</source>
- <translation type="obsolete">合成方式(_T):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-10"/>
+ <source>GMC</source>
+ <translation>GMC</translation>
 </message>
 <message>
- <source>_Split every MB:</source>
- <translation type="obsolete">分割成每個檔案幾MB(_S):</translation>
+ <location filename="../../common/gui_save.cpp" line="-468"/>
+ <source>Job</source>
+ <translation>工作</translation>
 </message>
 <message>
- <source>Mux _every x video frames:</source>
- <translation type="obsolete">合成每個 x 視訊畫格(_E):</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+2"/>
+ <source>MP2</source>
+ <translation>MP2</translation>
 </message>
 <message>
- <source>Mux in _blocks of x bytes:</source>
- <translation type="obsolete">以 x 位元的區塊數來合成(_B):</translation>
+ <location line="+1"/>
+ <source>MP3</source>
+ <translation>MP3</translation>
 </message>
 <message>
- <source>AVI Muxer Options</source>
- <translation type="obsolete">AVI 合成器選項</translation>
+ <location line="+9"/>
+ <source>MP4</source>
+ <translation>MP4</translation>
 </message>
 <message>
- <source>DTS</source>
- <translation type="obsolete">DTS</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
+ <source>Low</source>
+ <translation>低</translation>
 </message>
 <message>
+ <location line="+80"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-11"/>
 <source>PCM</source>
- <translation type="obsolete">PCM</translation>
+ <translation>PCM</translation>
 </message>
 <message>
- <source>MP2</source>
- <translation type="obsolete">MP2</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+8"/>
+ <source>Off</source>
+ <translation>關閉</translation>
 </message>
 <message>
- <source>MP3</source>
- <translation type="obsolete">MP3</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-13"/>
+ <source>SDL</source>
+ <translation>SDL</translation>
 </message>
 <message>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
 <source>WMA</source>
- <translation type="obsolete">WMA</translation>
- </message>
- <message>
- <source>LPCM</source>
- <translation type="obsolete">LPCM</translation>
+ <translation>WMA</translation>
 </message>
 <message>
- <source>AC3</source>
- <translation type="obsolete">AC3</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+4"/>
+ <source>x86</source>
+ <translation>x86</translation>
 </message>
 <message>
- <source>Ogg Vorbis</source>
- <translation type="obsolete">Ogg Vorbis</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+12"/>
+ <source>BVHQ</source>
+ <translation>BVHQ</translation>
 </message>
 <message>
- <source>AAC</source>
- <translation type="obsolete">AAC</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+1"/>
+ <source>Copy</source>
+ <translation>複製</translation>
 </message>
 <message>
- <source>QDM2</source>
- <translation type="obsolete">QDM2</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
+ <source>FLAC</source>
+ <translation>FLAC</translation>
 </message>
 <message>
- <source>AMR-NB</source>
- <translation type="obsolete">AMR-NB</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+27"/>
+ <source>H263</source>
+ <translation>H263</translation>
 </message>
 <message>
- <source>MSADPCM</source>
- <translation type="obsolete">MSADPCM</translation>
+ <location filename="../../common/gui_save.cpp" line="+434"/>
+ <location line="+83"/>
+ <source>Done</source>
+ <translation>完成</translation>
 </message>
 <message>
- <source>ULAW</source>
- <translation type="obsolete">ULAW</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+7"/>
+ <source>Gain</source>
+ <translation>增益</translation>
 </message>
 <message>
- <source>IMA ADPCM</source>
- <translation type="obsolete">IMA ADPCM</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-84"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
+ <source>High</source>
+ <translation>高</translation>
 </message>
 <message>
- <source>8-bit PCM</source>
- <translation type="obsolete">8位元 PCM</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-3"/>
+ <source>LPCM</source>
+ <translation>LPCM</translation>
 </message>
 <message>
- <source>Unknown codec</source>
- <translation type="obsolete">未知的編解碼器</translation>
+ <location filename="../../common/gui_save.cpp" line="-180"/>
+ <source>Jpeg</source>
+ <translation>Jpeg</translation>
 </message>
 <message>
- <source>Cannot initialize the video stream</source>
- <translation type="obsolete">無法初始化視訊流</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-7"/>
+ <source>Main</source>
+ <translation>主要</translation>
 </message>
 <message>
- <source>Dummy</source>
- <translation type="obsolete">虛擬</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+2"/>
+ <source>OPUS</source>
+ <translatorcomment>Opus Configure NO Display &amp; ALLAudio Bitrate : NO Display</translatorcomment>
+ <translation type="unfinished">OPUS</translation>
 </message>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
+ <source>Mono</source>
+ <translation>單音</translation>
 </message>
 <message>
- <source>Filter init failed</source>
- <translation type="obsolete">濾鏡初始化失敗</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+53"/>
+ <source>Mpeg</source>
+ <translation>Mpeg</translation>
 </message>
 <message>
- <source>Encoding</source>
- <translation type="obsolete">編碼中</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-10"/>
+ <location line="+25"/>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-50"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <source>Error while encoding</source>
- <translation type="obsolete">編碼時發生錯誤</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+6"/>
+ <source>QDM2</source>
+ <translation>QDM2</translation>
 </message>
 <message>
- <source>KeyFrame error</source>
- <translation type="obsolete">關鍵畫格錯誤</translation>
+ <location filename="../../common/gui_main.cpp" line="+1764"/>
+ <source>Oops</source>
+ <translation>Oops</translation>
 </message>
 <message>
- <source>The beginning frame is not a key frame.
-Please move the A marker.</source>
- <translation type="obsolete">開始的畫格不是一個關鍵畫格。
-請移動標記 A 。</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-36"/>
+ <source>Open</source>
+ <translation>開啟</translation>
 </message>
 <message>
- <source>Unsupported video</source>
- <translation type="obsolete">未支援的視訊</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-37"/>
+ <source>SIMD</source>
+ <translation>SIMD</translation>
 </message>
 <message>
- <source>Only FLV1 and VP6 video are supported</source>
- <translation type="obsolete">只支援 FLV1 和 VP6 視訊</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+33"/>
+ <source>Redo</source>
+ <translation>取消復原鍵入</translation>
 </message>
 <message>
- <source>Unsupported audio</source>
- <translation type="obsolete">不支援的音訊</translation>
+ <location line="-18"/>
+ <source>Quit</source>
+ <translation>離開</translation>
 </message>
 <message>
- <source>Audio must be mp3 for flv output.</source>
- <translation type="obsolete">flv 輸出的音訊必須是 mp3。</translation>
+ <location line="-13"/>
+ <source>Save</source>
+ <translation>儲存</translation>
 </message>
 <message>
- <source>Frequency must be 44100, 22050 or 11025 Hz.</source>
- <translation type="obsolete">頻率必須是 44100, 22050 或 11025 Hz。</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+3"/>
+ <source>ULAW</source>
+ <translation>ULAW</translation>
 </message>
 <message>
- <source>Cannot initialize the audio stream</source>
- <translation type="obsolete">無法初始化音訊流</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+30"/>
+ <source>Undo</source>
+ <translation>復原</translation>
 </message>
 <message>
- <source>PSP</source>
- <translation type="obsolete">PSP</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+ <source>_Gain mode:</source>
+ <translation>_增益模式:</translation>
 </message>
 <message>
- <source>Invalid audio stream detected</source>
- <translation type="obsolete">偵測到無效的音訊流</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="+48"/>
+ <source>No audio track</source>
+ <translation>沒有音軌</translation>
 </message>
 <message>
- <source>The audio stream may be invalid for this container.
-
-Continue anyway?</source>
- <translation type="obsolete">對這個容器而言此音訊流可能是無效的。
-
-仍要繼續嗎?</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-18"/>
+ <source>Stereo+surround</source>
+ <translation>立體+環繞</translation>
 </message>
 <message>
- <source>1st Pass</source>
- <translation type="obsolete">第一次運算</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+259"/>
+ <source>Plugins Info</source>
+ <translation>外掛程式資訊</translation>
 </message>
 <message>
- <source>2nd Pass</source>
- <translation type="obsolete">第二次運算</translation>
+ <location line="-93"/>
+ <source>Audio Device</source>
+ <translation>音訊裝置</translation>
 </message>
 <message>
- <source>This is not MPEG compatible</source>
- <translation type="obsolete">這個是不相容的 MPEG</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="+68"/>
+ <source>You don&apos;t have LAME!.
+It is needed to create FLV video.</source>
+ <translation>它沒&apos;有LAME！，它需要去建立 FLV影片。</translation>
 </message>
 <message>
- <source>You can&apos;t use the Copy codec.</source>
- <translation type="obsolete">無法使用複製的編解碼器。</translation>
+ <location filename="../../common/gui_save.cpp" line="+184"/>
+ <source>File %s was NOT saved correctly.</source>
+ <translation>檔案 %s 儲存不正確。</translation>
 </message>
 <message>
- <source>There is no audio track</source>
- <translation type="obsolete">沒有音軌</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+51"/>
+ <source>About</source>
+ <translation>關於</translation>
 </message>
 <message>
- <source>The first frame is not intra frame</source>
- <translation type="obsolete">此起始畫格不是內部畫格</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-7"/>
+ <source>E-AC3</source>
+ <translation>E-AC3</translation>
 </message>
 <message>
- <source>Use the &amp;lt;&amp;lt; and the &amp;gt;&amp;gt; buttons to move using Intra frames.</source>
- <translation type="obsolete">使用 &amp;lt;&amp;lt; 和 &amp;gt;&amp;gt; 按鈕來移動正在使用的內部畫格。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+212"/>
+ <location line="+3"/>
+ <location line="+5"/>
+ <location filename="../../common/gui_save.cpp" line="-296"/>
+ <location line="+21"/>
+ <location line="+7"/>
+ <location filename="../../common/gui_savenew.cpp" line="+409"/>
+ <source>Audio</source>
+ <translation>音訊</translation>
 </message>
 <message>
- <source>Audio track is not suitable</source>
- <translation type="obsolete">音軌不合</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-74"/>
+ <source>Close</source>
+ <translation>關閉</translation>
 </message>
 <message>
- <source>For VCD, audio must be 44.1 kHz MP2.</source>
- <translation type="obsolete">VCD 的音訊必須是 44.1 kHz MP2。</translation>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+172"/>
+ <location line="+32"/>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
+ <location line="+35"/>
+ <source>Codec</source>
+ <translation>編解碼器</translation>
 </message>
 <message>
- <source>For DVD, audio must be 48 kHz MP2(stereo), AC3, DTS or LPCM (stereo).</source>
- <translation type="obsolete">DVD 的音訊必須是 48 kHz MP2(立體聲)、AC3、DTS 或 LPCM (立體聲)。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-107"/>
+ <source>Display only error alerts</source>
+ <translation>只顯示錯誤警告</translation>
 </message>
 <message>
- <source>---</source>
- <translation type="obsolete">---</translation>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+632"/>
+ <location line="+44"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+ <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="-357"/>
+ <location line="+27"/>
+ <location line="+24"/>
+ <location line="+8"/>
+ <location line="+4"/>
+ <location filename="../../common/gui_save.cpp" line="+183"/>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <source>Saving</source>
- <translation type="obsolete">儲存中</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+33"/>
+ <source>HQ AC</source>
+ <translation>HQ AC</translation>
 </message>
 <message>
- <source>MPEG TS</source>
- <translation type="obsolete">MPEG TS</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+31"/>
+ <source>Mixer</source>
+ <translation>混音訊</translation>
 </message>
 <message>
- <source>MPEG VCD</source>
- <translation type="obsolete">MPEG VCD</translation>
+ <location filename="../../common/gui_savenew.cpp" line="-214"/>
+ <location line="+255"/>
+ <location line="+26"/>
+ <source>Muxer</source>
+ <translation>複合器</translation>
 </message>
 <message>
- <source>MPEG SVCD</source>
- <translation type="obsolete">MPEG SVCD</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+28"/>
+ <source>Paste</source>
+ <translation>貼上</translation>
 </message>
 <message>
- <source>MPEG DVD</source>
- <translation type="obsolete">MPEG DVD</translation>
+ <location line="-34"/>
+ <location filename="../../common/gui_save.cpp" line="+99"/>
+ <location line="+10"/>
+ <source>Queue</source>
+ <translation>工作清單</translation>
 </message>
 <message>
- <source>For DVD, audio must be 48 kHz MP2, AC3 or LPCM.</source>
- <translation type="obsolete">DVD 的音訊必須是 48 kHz MP2、AC3 或 LPCM。</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+85"/>
+ <source>Retry</source>
+ <translation>再試一次</translation>
 </message>
 <message>
- <source>MPEG Requantizer</source>
- <translation type="obsolete">MPEG 重複量化編碼</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-2"/>
+ <source>VDPAU</source>
+ <translation>VDPAU</translation>
 </message>
 <message>
- <source>MPEG ES</source>
- <translation type="obsolete">MPEG ES</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+33"/>
+ <source>Max Overflow Improvement(%)</source>
+ <translation>改進最大溢出(%)</translation>
 </message>
 <message>
- <source>Pass 1/2</source>
- <translation type="obsolete">運算 1/2</translation>
+ <location filename="../../common/gui_savenew.cpp" line="-140"/>
+ <location line="+12"/>
+ <location line="+16"/>
+ <location line="+8"/>
+ <source>Video</source>
+ <translation>影片</translation>
 </message>
 <message>
- <source>Cannot open &quot;%s&quot; for writing.</source>
- <translation type="obsolete">無法開啟 &quot;%s&quot; 進行寫入。</translation>
+ <location line="+37"/>
+ <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
+ <translation>不能設置音訊編碼器，請確保您的數據流是相容音訊編碼器(數位頻道、位元速率、格式）</translation>
 </message>
 <message>
- <source>Pass 2/2</source>
- <translation type="obsolete">運算 2/2</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+9"/>
+ <source>Overflow Control Strength</source>
+ <translation>溢出控制強度</translation>
 </message>
 <message>
- <source>Select a directory</source>
- <translation type="obsolete">選擇一個資料夾</translation>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
+ <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已編譯，沒有 VDPAUA 的支援，但它已編譯應用程式，安裝不匹配</translation>
 </message>
 <message>
- <source>Uinteger</source>
- <translation type="obsolete">非整數</translation>
+ <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
+ <source>Disabled</source>
+ <translation>停用</translation>
 </message>
 <message>
- <source>Test uinteger</source>
- <translation type="obsolete">測試非整數</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
+ <source>Pro Logic II</source>
+ <translation>第二代定向邏輯</translation>
 </message>
 <message>
- <source>Float</source>
- <translation type="obsolete">浮動</translation>
+ <location filename="../../common/gui_savenew.cpp" line="-73"/>
+ <source>Cannot instantiate video chain</source>
+ <translation>不能安裝影片鏈</translation>
 </message>
 <message>
- <source>Toggle</source>
- <translation type="obsolete">目標</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+54"/>
+ <source>Decoder Option</source>
+ <translation>解碼器選項</translation>
 </message>
 <message>
- <source>No Strategy</source>
- <translation type="obsolete">無策略</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-125"/>
+ <source>Enable 3DNOWEXT</source>
+ <translation>啟用 3DNOWEXT</translation>
 </message>
 <message>
- <source>3:2 Pulldown</source>
- <translation type="obsolete">3:2 Pulldown</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
+ <source>Previous Black Frame</source>
+ <translation>轉到上一幀黑框</translation>
 </message>
 <message>
- <source>Pal/Secam</source>
- <translation type="obsolete">Pal/Secam</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
+ <source>can&apos;t write to file &quot;%s&quot;: %s
+%s
+</source>
+ <translation>不&apos;能寫入檔案&quot;%s&quot;: %s
+ %s</translation>
 </message>
 <message>
- <source>NTSC converted from PAL</source>
- <translation type="obsolete">從 PAL 轉成 NTSC</translation>
+ <location filename="../../common/gui_main.cpp" line="-119"/>
+ <source>Main Audio Track</source>
+ <translation>主要音軌</translation>
 </message>
 <message>
- <source>menu</source>
- <translation type="obsolete">選單</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+ <source>Shift Value (ms):</source>
+ <translation>轉變音量 (ms):</translation>
 </message>
 <message>
- <source>Low</source>
- <translation type="obsolete">低</translation>
+ <location filename="../../common/gui_main.cpp" line="-675"/>
+ <source>Error while cutting out.</source>
+ <translation>剪下時發生錯誤</translation>
 </message>
 <message>
- <source>High</source>
- <translation type="obsolete">高</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-52"/>
+ <source>R_esampling (Hz):</source>
+ <translation>重複_取樣 (Hz):</translation>
 </message>
 <message>
- <source>Failed</source>
- <translation type="obsolete">已失敗</translation>
+ <location filename="../../common/gui_save.cpp" line="+0"/>
+ <source>Cannot add job %s</source>
+ <translation>不能增加工作 %s</translation>
 </message>
 <message>
- <source>_Background Image:</source>
- <translation type="obsolete">背景圖像(_B):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+124"/>
+ <source>Pro Logic</source>
+ <translation>定向邏輯</translation>
 </message>
 <message>
- <source>Select background image</source>
- <translation type="obsolete">選擇背景圖像</translation>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+629"/>
+ <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>
- <source>_NTSC (default is PAL):</source>
- <translation type="obsolete">_NTSC (預設為 PAL):</translation>
+ <location line="+6"/>
+ <source>Too short</source>
+ <translation>太短</translation>
 </message>
 <message>
- <source>Vignette _Width:</source>
- <translation type="obsolete">小插曲寬(_W):</translation>
+ <location filename="../../common/gui_main.cpp" line="+571"/>
+ <source>Marker A &gt; B</source>
+ <translation>標記 A &gt; B</translation>
 </message>
 <message>
- <source>Vignette _Height:</source>
- <translation type="obsolete">小插曲高(_H):</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-82"/>
+ <location line="+85"/>
+ <source>Please free up some space and press RETRY to try again.</source>
+ <translation>請釋放一些空間，然後按重試再試一次。</translation>
 </message>
 <message>
- <source>Vignette frame number</source>
- <translation type="obsolete">小插曲畫格數目</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-82"/>
+ <source>Connect to avsproxy</source>
+ <translation>連線至 avsproxy</translation>
 </message>
 <message>
- <source>Timecode:</source>
- <translation type="obsolete">時間碼:</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+97"/>
+ <source>GUI Rendering Options</source>
+ <translation>GUI 渲染選項</translation>
 </message>
 <message>
- <source>_Dynamic range compression</source>
- <translation type="obsolete">動態範圍壓縮(_D)</translation>
+ <location filename="../../common/gui_savenew.cpp" line="-141"/>
+ <location line="+255"/>
+ <source>Cannot instantiate muxer</source>
+ <translation>不能安裝複合器</translation>
 </message>
 <message>
- <source>_Time shift (ms):</source>
- <translation type="obsolete">時間位移 (ms)(_T):</translation>
+ <location filename="../../common/gui_main.cpp" line="+517"/>
+ <source>This function is disabled or no longer valid</source>
+ <translation>此功能被停用或不再有效</translation>
 </message>
 <message>
- <source>Time shift value (ms)</source>
- <translation type="obsolete">時間位移值 (ms)</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-56"/>
+ <source>Max B Frames</source>
+ <translation>Max B 模式</translation>
 </message>
 <message>
- <source>R_esampling (Hz):</source>
- <translation type="obsolete">重複取樣(_E) (Hz):</translation>
+ <location filename="../../common/gui_save.cpp" line="-48"/>
+ <source>BMP op failed</source>
+ <translation>BMP 通過失敗</translation>
 </message>
 <message>
- <source>Resampling frequency (Hz)</source>
- <translation type="obsolete">重複取樣頻率 (Hz)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+18"/>
+ <source>Stereo+center+surround</source>
+ <translation>立體+中央+環繞</translation>
 </message>
 <message>
- <source>Film to PAL</source>
- <translation type="obsolete">Film 轉成 PAL</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+61"/>
+ <source>Build Option</source>
+ <translation>建立選項</translation>
 </message>
 <message>
- <source>PAL to Film</source>
- <translation type="obsolete">PAL 轉成 Film</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+45"/>
+ <source>I-frames closer than...</source>
+ <translation>比I-幀更接近...</translation>
 </message>
 <message>
- <source>_Frame rate change:</source>
- <translation type="obsolete">畫格率改變(_F):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+27"/>
+ <source>_Filter strength:</source>
+ <translation>_濾鏡強度:</translation>
 </message>
 <message>
- <source>Automatic (max -3 dB)</source>
- <translation type="obsolete">自動 (最大值 -3 dB)</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-2"/>
+ <location line="+11"/>
+ <source>__unknown__</source>
+ <translation>__未知__</translation>
 </message>
 <message>
- <source>Manual</source>
- <translation type="obsolete">手動</translation>
+ <location filename="../../common/gui_main.cpp" line="-1583"/>
+ <source>Select script to run</source>
+ <translation>選擇腳本去執行</translation>
 </message>
 <message>
- <source>_Gain mode:</source>
- <translation type="obsolete">增益模式(_G):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-99"/>
+ <source>No downmixing</source>
+ <translation>沒降混合</translation>
 </message>
 <message>
- <source>G_ain value:</source>
- <translation type="obsolete">增益值(_A):</translation>
+ <location line="-120"/>
+ <source>Enable SSE2</source>
+ <translation>啟用 SSE2</translation>
 </message>
 <message>
- <source>Gain</source>
- <translation type="obsolete">增益</translation>
+ <location line="-22"/>
+ <source>Decode video using VideoToolbox (macOS)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>No change</source>
- <translation type="obsolete">沒有改變</translation>
+ <location line="+23"/>
+ <source>Enable SSE3</source>
+ <translation>啟用 SSE3</translation>
 </message>
 <message>
- <source>Stereo+surround</source>
- <translation type="obsolete">立體+環繞</translation>
+ <location line="-15"/>
+ <source>_Revert to saved default output settings on video load</source>
+ <translation>_在影片負載時還原到儲存的預設輸出設定上</translation>
 </message>
 <message>
- <source>Stereo+center</source>
- <translation type="obsolete">立體+中央</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+64"/>
+ <source>Audio Device Plugins</source>
+ <translation>外掛-音訊裝置(ADM)</translation>
 </message>
 <message>
- <source>Stereo+center+surround</source>
- <translation type="obsolete">立體+中央+環繞</translation>
+ <location filename="../../common/gui_main.cpp" line="+1079"/>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+119"/>
+ <source>Something bad happened</source>
+ <translation>有些事發生問題</translation>
 </message>
 <message>
- <source>Stereo front+stereo rear</source>
- <translation type="obsolete">前段立體+後段立體</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+6"/>
+ <source>MSADPCM</source>
+ <translation>MSADPCM</translation>
 </message>
 <message>
- <source>5 channels</source>
- <translation type="obsolete">5 聲道</translation>
+ <location filename="../../common/gui_main.cpp" line="-13"/>
+ <source>Cannot delete the selection.</source>
+ <translation>無法刪除此選取範圍。</translation>
 </message>
 <message>
- <source>5.1</source>
- <translation type="obsolete">5.1</translation>
+ <location line="-358"/>
+ <source>Multiple Audio Tracks</source>
+ <translation>多音軌</translation>
 </message>
 <message>
- <source>Dolby Pro Logic</source>
- <translation type="obsolete">杜比定向邏輯</translation>
+ <location line="-336"/>
+ <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>
- <source>Dolby Pro Logic II</source>
- <translation type="obsolete">第二代杜比定向邏輯</translation>
+ <location line="+103"/>
+ <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>
 <message>
- <source>_Mixer:</source>
- <translation type="obsolete">混合器(_M):</translation>
+ <location line="+3"/>
+ <source>Deleting</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Audio Filters</source>
- <translation type="obsolete">音訊濾鏡</translation>
+ <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>
 </message>
 <message>
- <source>No data</source>
- <translation type="obsolete">沒有資料</translation>
+ <location line="+24"/>
+ <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>
- <source>Max. bitrate:</source>
- <translation type="obsolete">最大位元率:</translation>
+ <location line="+5"/>
+ <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>
- <source>Average bitrate:</source>
- <translation type="obsolete">平均位元率:</translation>
+ <location line="+305"/>
+ <source>Something failed when appending</source>
+ <translation>當增加時某些事情失敗</translation>
 </message>
 <message>
- <source>Number of I frames:</source>
- <translation type="obsolete">I 畫格數目:</translation>
+ <location line="+618"/>
+ <source>Failed to connect to avsproxy.
+Is it running ?</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Number of P frames:</source>
- <translation type="obsolete">P 畫格數目:</translation>
+ <location filename="../../common/gui_save.cpp" line="-472"/>
+ <source>Select Workbench to Save</source>
+ <translation>選擇工作台進行儲存</translation>
 </message>
 <message>
- <source>Number of B frames:</source>
- <translation type="obsolete">B 畫格數目:</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+2"/>
+ <source>Re_verse UP and DOWN arrow keys for navigation</source>
+ <translation>反_轉向上和向下方向鍵進行導航</translation>
 </message>
 <message>
- <source>Max. B frames:</source>
- <translation type="obsolete">最大 B 畫格數:</translation>
+ <location line="+84"/>
+ <source>SDL (good)</source>
+ <translation>SDL (好)</translation>
 </message>
 <message>
- <source>Bitrate Histogram</source>
- <translation type="obsolete">位元率分佈圖</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-95"/>
+ <location line="+85"/>
+ <source>quota exceeded</source>
+ <translation>超出額配</translation>
 </message>
 <message>
- <source>Fontconfig</source>
- <translation type="obsolete">Fontconfig</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+119"/>
+ <source>User Interface</source>
+ <translation>使用者介面</translation>
 </message>
 <message>
- <source>Gettext</source>
- <translation type="obsolete">Gettext</translation>
+ <location filename="../../common/gui_savenew.cpp" line="+26"/>
+ <source>Cannot open </source>
+ <translation>不能開啟</translation>
 </message>
 <message>
- <source>SDL</source>
- <translation type="obsolete">SDL</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+17"/>
+ <source>G_ain value:</source>
+ <translation>增_益值:</translation>
 </message>
 <message>
- <source>XVideo</source>
- <translation type="obsolete">XVideo</translation>
+ <location line="+17"/>
+ <source>Shift audio:</source>
+ <translation>轉變音訊</translation>
 </message>
 <message>
- <source>AltiVec</source>
- <translation type="obsolete">AltiVec</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-24"/>
+ <source>Max Gop Size</source>
+ <translation>最大Gop(圖像群組)大小</translation>
 </message>
 <message>
- <source>PowerPC</source>
- <translation type="obsolete">PowerPC</translation>
+ <location filename="../../common/gui_savenew.cpp" line="-300"/>
+ <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+ <translation>重用以前首先傳遞資料？警告，設定必須關閉</translation>
 </message>
 <message>
- <source>x86</source>
- <translation type="obsolete">x86</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+2"/>
+ <source>IMA ADPCM</source>
+ <translation>IMA ADPCM</translation>
 </message>
 <message>
- <source>x86-64</source>
- <translation type="obsolete">x86-64</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+6"/>
+ <source>Open Application Data &amp;Folder</source>
+ <translation>開啟應用程式資料夾 &amp;目錄</translation>
 </message>
 <message>
- <source>Libraries</source>
- <translation type="obsolete">函式庫</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-161"/>
+ <source>Above normal</source>
+ <translation>高於一般</translation>
 </message>
 <message>
- <source>CPU</source>
- <translation type="obsolete">CPU</translation>
+ <location filename="../../common/gui_main.cpp" line="-1423"/>
+ <source>Select script to save</source>
+ <translation>選擇腳本去儲存</translation>
 </message>
 <message>
- <source>Built-in Support</source>
- <translation type="obsolete">內建的支援</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-1"/>
+ <source>Min Gop Size</source>
+ <translation>最小Gop(圖像群組)大小</translation>
 </message>
 <message>
- <source>_Hours:</source>
- <translation type="obsolete">小時(_H):</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+9"/>
+ <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
+</source>
+ <translation>不&apos;能寫入檔案&quot;%s&quot;: %u (%s)</translation>
 </message>
 <message>
- <source>_Minutes:</source>
- <translation type="obsolete">分鐘(_M):</translation>
+ <source>Create _OpenDML files</source>
+ <translation type="vanished">建立 _開啟DML 檔案</translation>
 </message>
 <message>
- <source>_Seconds:</source>
- <translation type="obsolete">秒(_S):</translation>
+ <location filename="../../common/gui_main.cpp" line="+250"/>
+ <source>Select Video File to Append...</source>
+ <translation>選擇影片去附加合併(二影片寬高比要一致)...</translation>
 </message>
 <message>
- <source>Go to Time</source>
- <translation type="obsolete">前往時間點</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-28"/>
+ <source>Enable SSSE3</source>
+ <translation>啟用 SSSE3</translation>
 </message>
 <message>
- <source>_Job name:</source>
- <translation type="obsolete">工作名稱(_J):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-58"/>
+ <source>Video Encoder Plugins</source>
+ <translation>外掛-影片編碼器(ADM)</translation>
 </message>
 <message>
- <source>Output _File:</source>
- <translation type="obsolete">輸出檔案(_F):</translation>
+ <location line="+29"/>
+ <source>Video Decoder Plugins</source>
+ <translation>外掛-影片解碼器(ADM)</translation>
 </message>
 <message>
- <source>Select Video To Write</source>
- <translation type="obsolete">選擇影片來寫入</translation>
+ <location filename="../../common/gui_main.cpp" line="+1020"/>
+ <source>Unable to set the audio language: No video loaded yet!</source>
+ <translation>無法設置音訊語言：仍然未載入影片！</translation>
 </message>
 <message>
- <source>Save Job</source>
- <translation type="obsolete">儲存工作</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-14"/>
+ <source>Select Track</source>
+ <translation>選擇音訊音軌</translation>
 </message>
 <message>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+1"/>
 <source>_Swap U and V</source>
- <translation type="obsolete">置換 U 和 V(_S)</translation>
- </message>
- <message>
- <source>Show motion _vectors</source>
- <translation type="obsolete">顯示動作向量(_V)</translation>
+ <translation>_U和V交換色彩</translation>
 </message>
 <message>
- <source>Decoder Options</source>
- <translation type="obsolete">解碼器選項</translation>
- </message>
- <message>
- <source>User Interface</source>
- <translation type="obsolete">使用介面</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
+ <source>Below normal</source>
+ <translation>低於一般</translation>
 </message>
 <message>
- <source>Select idx file:</source>
- <translation type="obsolete">選擇 idx 檔:</translation>
+ <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
+ <source>Auto-detect</source>
+ <translation>自動偵測</translation>
 </message>
 <message>
- <source>Use GlyphSet (optional):</source>
- <translation type="obsolete">使用字庫(選擇性):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+ <source>_Encoding priority:</source>
+ <translation>_編碼優先次序:</translation>
 </message>
 <message>
- <source>Select GlyphSet file</source>
- <translation type="obsolete">選擇字型檔</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-30"/>
+ <source>Dolby Pro Logic</source>
+ <translation>杜比定向邏輯</translation>
 </message>
 <message>
- <source>Output SRT file</source>
- <translation type="obsolete">輸出 SRT 檔案</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+ <source>Enable 3DNOW</source>
+ <translation>啟用 3DNOW</translation>
 </message>
 <message>
- <source>Save SRT file</source>
- <translation type="obsolete">儲存 SRT 檔案</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+117"/>
+ <source>Muxer Plugins</source>
+ <translation>外掛-複合器(ADM)</translation>
 </message>
 <message>
- <source>Select input and ouput files</source>
- <translation type="obsolete">選擇輸入和輸出檔</translation>
+ <location line="-30"/>
+ <source>Demuxer Plugins</source>
+ <translation>外掛-分離器(ADM)</translation>
 </message>
 <message>
- <source>The idx/sub file does not exist.</source>
- <translation type="obsolete">此 idx/sub 檔不存在。</translation>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
+ <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已編譯沒有 DXVA2 的支援，但它已編譯應用程式，安裝不匹配</translation>
 </message>
 <message>
- <source>Please Select a valid output SRT file.</source>
- <translation type="obsolete">請選擇一個有效的 SRT 輸出檔。</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="+14"/>
+ <source>Cannot select FLV1 codec.</source>
+ <translation>不能選擇 FLV1 編解碼器。</translation>
 </message>
 <message>
- <source>Cannot load the glyphset file.</source>
- <translation type="obsolete">無法載入此字庫檔。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+1"/>
+ <source>Dolby Pro Logic II</source>
+ <translation>第二代杜比定向邏輯</translation>
 </message>
 <message>
- <source>GlyphSet filename</source>
- <translation type="obsolete">字庫檔名</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="+27"/>
+ <source>Cannot select MPEG-4 SP codec.</source>
+ <translation>不能選擇 MPEG-4 SP 編解碼器。</translation>
 </message>
 <message>
- <source>Save GlyphSet file</source>
- <translation type="obsolete">儲存字庫檔案</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+2"/>
+ <source>GOP Size</source>
+ <translation>最小Gop(圖像群組)大小</translation>
 </message>
 <message>
- <source>Save Glyph</source>
- <translation type="obsolete">儲存字形</translation>
+ <location filename="../../common/gui_main.cpp" line="-616"/>
+ <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
+ <translation>嘗試 &apos;檔案&apos; -&gt; &apos;載入/執行 專案...&apos;</translation>
 </message>
 <message>
- <source>Input TS:</source>
- <translation type="obsolete">輸入 TS:</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="-79"/>
+ <source>No AAC audio encoder plugin found.</source>
+ <translation>發現沒有 AAC 音訊編碼器外掛程式。</translation>
 </message>
 <message>
- <source>Select TS file</source>
- <translation type="obsolete">選擇 TS 檔案</translation>
+ <location filename="../../common/gui_main.cpp" line="+811"/>
+ <source>Frame Hex Dump</source>
+ <translation>幀十六進位轉儲</translation>
 </message>
 <message>
- <source>Subtitle PID:</source>
- <translation type="obsolete">字幕 PID:</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+19"/>
+ <source>_Mixer:</source>
+ <translation>_混合器:</translation>
 </message>
 <message>
- <source>Please Select a valid TS file.</source>
- <translation type="obsolete">請選擇有效的 TS 檔案。</translation>
+ <location line="+13"/>
+ <source>Audio Filters</source>
+ <translation>音訊濾鏡</translation>
 </message>
 <message>
- <source>Save GlyphSet</source>
- <translation type="obsolete">儲存字庫</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-2"/>
+ <source>PAL 4:3</source>
+ <translation>PAL 4:3</translation>
 </message>
 <message>
- <source>_Filter strength:</source>
- <translation type="obsolete">濾鏡強度(_F):</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-3"/>
+ <source>AMR-NB</source>
+ <translation>AMR-NB</translation>
 </message>
 <message>
- <source>_Horizontal deblocking</source>
- <translation type="obsolete">去除水平方向塊狀色斑(_H)</translation>
+ <location filename="../../common/gui_main.cpp" line="-865"/>
+ <source>Permission error</source>
+ <translation>權限許可錯誤</translation>
 </message>
 <message>
- <source>_Vertical deblocking</source>
- <translation type="obsolete">去除垂直方向塊狀色斑(_V)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
+ <source>_Job name:</source>
+ <translation>_工作名稱:</translation>
 </message>
 <message>
- <source>_Deringing</source>
- <translation type="obsolete">去除環狀色斑(_R)</translation>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
+ <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已編譯，沒有 LIBVA 的支援，但它已編譯應用程式，安裝不匹配</translation>
 </message>
 <message>
- <source>Postprocessing</source>
- <translation type="obsolete">後置處理</translation>
+ <location filename="../../common/gui_main.cpp" line="+678"/>
+ <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
+ <translation>設定語言提供跟蹤索引是不可能的：影片有沒有音訊檔！</translation>
 </message>
 <message>
- <source>_Use systray while encoding</source>
- <translation type="obsolete">編碼時使用工作欄(_U)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+67"/>
+ <source>OpenGL (best)</source>
+ <translation>OpenGL (最好)</translation>
 </message>
 <message>
- <source>_Accept non-standard audio frequency for DVD</source>
- <translation type="obsolete">同意在 DVD 使用非標準的音訊頻率(_A)</translation>
+ <location filename="../../common/gui_save.cpp" line="+13"/>
+ <source>Select JPEG Sequence to Save</source>
+ <translation>選擇 JPEG 順序進行儲存</translation>
 </message>
 <message>
- <source>Create _OpenDML files</source>
- <translation type="obsolete">建立 _OpenDML 檔案</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <source>Append</source>
+ <translation>同寬高影片合併</translation>
 </message>
 <message>
- <source>Automatically _index MPEG files</source>
- <translation type="obsolete">自動索引 MPEG 檔(_I)</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-86"/>
+ <source>can&apos;t open &quot;%s&quot;: %u (%s)
+</source>
+ <translation>不&apos;能開啟&quot;%s&quot;: %u (%s)</translation>
 </message>
 <message>
- <source>Automatically _swap A and B if A&gt;B</source>
- <translation type="obsolete">如果 A&gt;B ，則自動置換 A 和 B(_S)</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
+ <location line="+2"/>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <source>_Disable NUV audio sync</source>
- <translation type="obsolete">停用 NUV 音訊同步(_D)</translation>
+ <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <source>Automatically _build VBR map</source>
- <translation type="obsolete">自動建立變動位元率(VBR)對應(_B)</translation>
+ <location filename="../../common/gui_main.cpp" line="-1110"/>
+ <source>Not coded in this version</source>
+ <translation>沒有編進這個版本</translation>
 </message>
 <message>
- <source>Automatically _rebuild index</source>
- <translation type="obsolete">自動重新建立索引(_R)</translation>
+ <location filename="../../common/gui_save.cpp" line="+483"/>
+ <source>Failed</source>
+ <translation>已失敗</translation>
 </message>
 <message>
- <source>Automatically remove _packed bitstream</source>
- <translation type="obsolete">自動地移除打包好的位元流(_P)</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+19"/>
+ <source>Two Pass Tuning</source>
+ <translation>2 通調優</translation>
 </message>
 <message>
- <source>SIMD</source>
- <translation type="obsolete">SIMD</translation>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+3"/>
+ <source>Output _File:</source>
+ <translation>輸出_檔案:</translation>
 </message>
 <message>
- <source>Enable all SIMD</source>
- <translation type="obsolete">開啟所有 SIMD</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+79"/>
+ <source>Ignore</source>
+ <translation>忽略</translation>
 </message>
 <message>
- <source>Enable MMX</source>
- <translation type="obsolete">開啟 MMX</translation>
+ <source>Failed to connect to avsproxy.
+ Is it running ?</source>
+ <translation type="vanished">無法連線到 avs代理，
+要繼續執行嗎?</translation>
 </message>
 <message>
- <source>Enable MMXEXT</source>
- <translation type="obsolete">開啟 MMXEXT</translation>
+ <location filename="../../common/gui_main.cpp" line="+870"/>
+ <source>No error found</source>
+ <translation>沒有找到錯誤</translation>
 </message>
 <message>
- <source>Enable 3DNOW</source>
- <translation type="obsolete">開啟 3DNOW</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+53"/>
+ <source>Next Intra Frame</source>
+ <translation>轉到下一幀(關鍵幀或I幀)</translation>
 </message>
 <message>
- <source>Enable 3DNOWEXT</source>
- <translation type="obsolete">開啟 3DNOWEXT</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="-14"/>
+ <location line="+14"/>
+ <location line="+31"/>
+ <location line="+6"/>
+ <location line="+15"/>
+ <location line="+27"/>
+ <location line="+35"/>
+ <source>Codec Error</source>
+ <translation>編解碼器錯誤</translation>
 </message>
 <message>
- <source>Enable SSE</source>
- <translation type="obsolete">開啟 SSE</translation>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+ <source>Internal error finding codec 0x%x</source>
+ <translation>發現編解碼器內部錯誤</translation>
 </message>
 <message>
- <source>Enable SSE2</source>
- <translation type="obsolete">開啟 SSE2</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+50"/>
+ <source>Master</source>
+ <translation>主要</translation>
 </message>
 <message>
- <source>Enable SSE3</source>
- <translation type="obsolete">開啟 SSE3</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-57"/>
+ <source>Medium</source>
+ <translation>中</translation>
 </message>
 <message>
- <source>Enable SSSE3</source>
- <translation type="obsolete">開啟 SSSE3</translation>
+ <location line="+43"/>
+ <source>Motion</source>
+ <translation>運動</translation>
 </message>
 <message>
- <source>_lavc threads:</source>
- <translation type="obsolete">_lavc 訊息串:</translation>
+ <location filename="../../common/gui_save.cpp" line="-514"/>
+ <source>Job name</source>
+ <translation>工作名稱</translation>
 </message>
 <message>
- <source>Multi-threading</source>
- <translation type="obsolete">多執行緒</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+52"/>
+ <source>Muxers</source>
+ <translation>複合器</translation>
 </message>
 <message>
- <source>Above normal</source>
- <translation type="obsolete">高於一般</translation>
+ <location filename="../../common/gui_save.cpp" line="+427"/>
+ <source>Saved %d images.</source>
+ <translation>已儲存 %d 個圖像。</translation>
 </message>
 <message>
- <source>Below normal</source>
- <translation type="obsolete">低於一般</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
+ <source>Normal</source>
+ <translation>一般</translation>
 </message>
 <message>
- <source>_Encoding priority:</source>
- <translation type="obsolete">編碼優先次序(_E):</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-71"/>
+ <location line="+2"/>
+ <source>Clear recent items</source>
+ <translation>清除最近使用的 檔案 及 專案</translation>
 </message>
 <message>
- <source>_Indexing/unpacking priority:</source>
- <translation type="obsolete">索引/拆開打包的優先次序(_I):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-58"/>
+ <source>Decode video using DXVA2 (windows)</source>
+ <translation>解碼影片使用 DXVA2 (windows)</translation>
 </message>
 <message>
- <source>_Playback priority:</source>
- <translation type="obsolete">倒帶優先次序(_P):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-39"/>
+ <source>Motion Search Precision</source>
+ <translation>運動搜索精度</translation>
 </message>
 <message>
- <source>Prioritisation</source>
- <translation type="obsolete">優化</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+225"/>
+ <source>Output</source>
+ <translation>輸出</translation>
 </message>
 <message>
- <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="obsolete">在 .mp4 對 MP3 使用選擇對象標籤(_U)</translation>
+ <location filename="../../common/gui_save.cpp" line="-188"/>
+ <source>Cannot create stream</source>
+ <translation>不能建立流</translation>
 </message>
 <message>
- <source>XVideo (best)</source>
- <translation type="obsolete">XVideo (最好)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-204"/>
+ <source>Enable all SIMD</source>
+ <translation>啟用所有 SIMD</translation>
 </message>
 <message>
- <source>SDL (MS Windows GDI)</source>
- <translation type="obsolete">SDL (MS Windows GDI)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-11"/>
+ <source>Remix:</source>
+ <translation>重新混合</translation>
 </message>
 <message>
- <source>SDL (MS Windows DirectX)</source>
- <translation type="obsolete">SDL (MS Windows DirectX)</translation>
+ <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-44"/>
+ <location line="+44"/>
+ <source>You cannot remove *all* the video
+</source>
+ <translation>你不能刪除*所有*的影片</translation>
 </message>
 <message>
- <source>SDL (good)</source>
- <translation type="obsolete">SDL (好)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-19"/>
+ <source>Decode video using XVBA (AMD)</source>
+ <translation>解碼影片使用 XVBA (AMD)</translation>
 </message>
 <message>
- <source>Video _display:</source>
- <translation type="obsolete">視訊顯示(_D):</translation>
+ <location line="+164"/>
+ <source>_AudioDevice</source>
+ <translation>_音訊裝置</translation>
 </message>
 <message>
- <source>No alerts</source>
- <translation type="obsolete">不顯示任何警告</translation>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="-171"/>
+ <source>Saving</source>
+ <translation>儲存中</translation>
 </message>
 <message>
- <source>Display only error alerts</source>
- <translation type="obsolete">只顯示錯誤警告</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-29"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+ <source>Stereo</source>
+ <translation>立體聲</translation>
 </message>
 <message>
- <source>Display all alerts</source>
- <translation type="obsolete">顯示所有警告</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-11"/>
+ <source>WMAPRO</source>
+ <translation>WMAPRO</translation>
 </message>
 <message>
- <source>_Message level:</source>
- <translation type="obsolete">訊息等級(_M):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+7"/>
+ <source>Wide Search</source>
+ <translation>廣泛搜尋</translation>
 </message>
 <message>
- <source>Master</source>
- <translation type="obsolete">主要</translation>
+ <location filename="../../common/gui_main.cpp" line="-1042"/>
+ <source>Select script to debug</source>
+ <translation>選擇腳本去除錯</translation>
 </message>
 <message>
- <source>_Volume control:</source>
- <translation type="obsolete">音量控制(_V):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+20"/>
+ <source>More Search</source>
+ <translation>更多搜尋</translation>
 </message>
 <message>
- <source>No downmixing</source>
- <translation type="obsolete">沒有降混</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+7"/>
+ <source>Ogg Vorbis</source>
+ <translation>Ogg Vorbis</translation>
 </message>
 <message>
- <source>Pro Logic</source>
- <translation type="obsolete">定向邏輯</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-22"/>
+ <source>Limited Search</source>
+ <translation>限度搜尋</translation>
 </message>
 <message>
- <source>Pro Logic II</source>
- <translation type="obsolete">第二代定向邏輯</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-1"/>
+ <source>XVideo</source>
+ <translation>XVideo</translation>
 </message>
 <message>
- <source>_Local playback downmixing:</source>
- <translation type="obsolete">局部倒帶降混(_L):</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+1"/>
+ <source>PAL 16:9</source>
+ <translation>PAL 16:9</translation>
 </message>
 <message>
- <source>De_ringing</source>
- <translation type="obsolete">去除環狀色斑(_R)</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
+ <source>First Frame</source>
+ <translation>轉到第一幀(開始)</translation>
 </message>
 <message>
- <source>_Strength:</source>
- <translation type="obsolete">強度(_S):</translation>
+ <location filename="../../common/gui_main.cpp" line="+604"/>
+ <source>Cannot open &quot;%s&quot;.</source>
+ <translation>無法開啟 &quot;%s&quot;。</translation>
 </message>
 <message>
- <source>Default Postprocessing</source>
- <translation type="obsolete">預設的後置處理</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+1"/>
+ <source>Medium Search</source>
+ <translation>中等搜尋</translation>
 </message>
 <message>
- <source>Use _Global GlyphSet</source>
- <translation type="obsolete">使用整體字庫(_G)</translation>
+ <source>The video has been saved but seems to be incomplete.</source>
+ <translation type="vanished">影片已儲存，但似乎並不完整。</translation>
 </message>
 <message>
- <source>Gl_yphSet:</source>
- <translation type="obsolete">字庫(_Y):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-115"/>
+ <source>Video Decoder</source>
+ <translation>影片解碼器</translation>
 </message>
 <message>
- <source>Automation</source>
- <translation type="obsolete">自動化</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+1"/>
+ <source>Last Frame</source>
+ <translation>轉到最後一幀(結束)</translation>
 </message>
 <message>
- <source>Input</source>
- <translation type="obsolete">輸入</translation>
+ <location line="-6"/>
+ <source>Next Frame</source>
+ <translation>轉到下一幀</translation>
 </message>
 <message>
- <source>Output</source>
- <translation type="obsolete">輸出</translation>
+ <location filename="../../common/gui_save.cpp" line="-246"/>
+ <source>Cannot reach database. Do you have Job control running ?</source>
+ <translation>不能到達資料庫，你有工作控制執行嗎？</translation>
 </message>
 <message>
- <source>Audio</source>
- <translation type="obsolete">音訊</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+19"/>
+ <source>Zoom 1:1</source>
+ <translation>縮放 1:1</translation>
 </message>
 <message>
- <source>Video</source>
- <translation type="obsolete">視訊</translation>
+ <location line="-1"/>
+ <source>Zoom 1:2</source>
+ <translation>縮放 1:2</translation>
 </message>
 <message>
- <source>Threading</source>
- <translation type="obsolete">執行緒</translation>
+ <location line="-104"/>
+ <source>Save as PNG</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Global GlyphSet</source>
- <translation type="obsolete">整體字庫</translation>
+ <location line="+2"/>
+ <source>Save Selection as JPEG</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Preferences</source>
- <translation type="obsolete">偏好設定</translation>
+ <location line="+52"/>
+ <source>Play filtered</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Shrink Factor:</source>
- <translation type="obsolete">收縮係數(_S):</translation>
+ <location line="+49"/>
+ <source>Zoom 1:4</source>
+ <translation>縮放 1:4</translation>
 </message>
 <message>
- <source>Requant Configuration</source>
- <translation type="obsolete">重複量化設定</translation>
+ <location line="+3"/>
+ <source>Zoom 2:1</source>
+ <translation>縮放 2:1</translation>
 </message>
 <message>
- <source>Arabic</source>
- <translation type="obsolete">阿拉伯</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+34"/>
+ <source>Audio Encoder Plugins</source>
+ <translation>外掛-音訊編碼器(ADM)</translation>
 </message>
 <message>
- <source>Baltic</source>
- <translation type="obsolete">波羅地海</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
+ <source>DXVA2 (best)</source>
+ <translation>DXVA2 (最好)</translation>
 </message>
 <message>
- <source>Chinese Simplified (GB2312)</source>
- <translation type="obsolete">簡體中文 (GB2312)</translation>
+ <location line="+47"/>
+ <source>No alerts</source>
+ <translation>不顯示任何警告</translation>
 </message>
 <message>
- <source>Chinese Traditional (Big5)</source>
- <translation type="obsolete">繁體中文 (Big5)</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+43"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
 </message>
 <message>
- <source>Cyrillic</source>
- <translation type="obsolete">斯拉夫字母</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+246"/>
+ <source>Cannot compile shader</source>
+ <translation>無法編譯著色器</translation>
 </message>
 <message>
- <source>Latin-1 (Western European)</source>
- <translation type="obsolete">拉丁-1 (西歐)</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-89"/>
+ <source>can&apos;t open &quot;%s&quot;: %s
+%s
+</source>
+ <translation>不&apos;能開啟&quot;%s&quot;: %s
+ %s</translation>
 </message>
 <message>
- <source>Latin-2 (Central European)</source>
- <translation type="obsolete">拉丁-2 (中歐)</translation>
+ <source>Aborting.</source>
+ <translation type="vanished">正在中止。</translation>
 </message>
 <message>
- <source>Greek</source>
- <translation type="obsolete">希臘</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-2"/>
+ <source>No change</source>
+ <translation>沒有改變</translation>
 </message>
 <message>
- <source>Hebrew</source>
- <translation type="obsolete">希伯來</translation>
+ <location filename="../../common/gui_main.cpp" line="-533"/>
+ <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>
 <message>
- <source>Slovene</source>
- <translation type="obsolete">斯洛凡尼亞</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-9"/>
+ <location line="+3"/>
+ <source>Sdl driver</source>
+ <translation>Sdl 驅動程式r</translation>
 </message>
 <message>
- <source>Turkish</source>
- <translation type="obsolete">土耳其</translation>
+ <location filename="../../common/gui_main.cpp" line="+137"/>
+ <source>No engine</source>
+ <translation>沒有引擎</translation>
 </message>
 <message>
- <source>UTF-8</source>
- <translation type="obsolete">UTF-8</translation>
+ <location line="+400"/>
+ <source>&quot;%s&quot; does not exist.</source>
+ <translation>&quot;%s&quot; 不存在。</translation>
 </message>
 <message>
- <source>UTF-16</source>
- <translation type="obsolete">UTF-16</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-107"/>
+ <source>Save as BMP</source>
+ <translation>另存 BMP</translation>
 </message>
 <message>
- <source>_Subtitle file:</source>
- <translation type="obsolete">字幕檔(_S):</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
+ <source>Building time map</source>
+ <translation>建立時間軸</translation>
 </message>
 <message>
- <source>Select Subtitle file</source>
- <translation type="obsolete">選擇字幕檔</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-124"/>
+ <source>Decode video using VDPAU (NVIDIA)</source>
+ <translation>解碼影片使用 VDPAU (NVIDIA)</translation>
 </message>
 <message>
- <source>_Font (TTF):</source>
- <translation type="obsolete">字型 (TT_F):</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="+1"/>
+ <source>You don&apos;t have FAAC!.
+It is needed to create PSP compatible video.</source>
+ <translation>你沒&apos;有FAAC!，它是建立 PSP 相容影片所需。</translation>
 </message>
 <message>
- <source>Select TTF file</source>
- <translation type="obsolete">選擇 TTF 檔</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+ <source>Load saved settings</source>
+ <translation>載入儲存設定</translation>
 </message>
 <message>
- <source>_Encoding:</source>
- <translation type="obsolete">編碼(_E):</translation>
+ <source>_Split MPEG files every (MB):</source>
+ <translation type="vanished">_大檔案自動分割每個 MPEG 檔為(MB):</translation>
 </message>
 <message>
- <source>S_elect C_olor</source>
- <translation type="obsolete">選擇顏色</translation>
+ <location filename="../../common/gui_main.cpp" line="+859"/>
+ <source>Frame size:</source>
+ <translation>幀大小:</translation>
 </message>
 <message>
- <source>Set Size and _Position</source>
- <translation type="obsolete">設定大小和位置(_P)</translation>
+ <location line="-1"/>
+ <source>Frame type:</source>
+ <translation>幀類型:</translation>
 </message>
 <message>
- <source>_Auto split</source>
- <translation type="obsolete">自動分割(_A)</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+24"/>
+ <source>Plugins</source>
+ <translation>外掛程式</translation>
 </message>
 <message>
- <source>_Delay (ms):</source>
- <translation type="obsolete">延遲 (ms)(_D):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
+ <source>VDPAU (best)</source>
+ <translation>VDPAU (最好)</translation>
 </message>
 <message>
- <source>Auto (might not work)</source>
- <translation type="obsolete">自動 (可能無效)</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="-129"/>
+ <source>Cannot select the MPEG-4 SP codec.</source>
+ <translation>不能選擇的 MPEG-4 SP 編解碼器。</translation>
 </message>
 <message>
- <source>Top field first</source>
- <translation type="obsolete">頂部圖場開始</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-3"/>
+ <location line="+1"/>
+ <source>NTSC 16:9</source>
+ <translation>NTSC 16:9</translation>
 </message>
 <message>
- <source>Bottom field first</source>
- <translation type="obsolete">底部圖場開始</translation>
+ <location filename="../../common/gui_savenew.cpp" line="+263"/>
+ <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>這個影片是在複製模式，但剪下的點不是在關鍵幀(I幀)上，該影片將被儲存，但會有缺陷在切割點。</translation>
 </message>
 <message>
- <source>Bottom field (keep top)</source>
- <translation type="obsolete">底部圖場(保持頂部)</translation>
+ <location filename="../../common/gui_main.cpp" line="-858"/>
+ <source>File error</source>
+ <translation>檔案錯誤</translation>
 </message>
 <message>
- <source>Top field (keep bottom)</source>
- <translation type="obsolete">頂部圖場(保持底部)</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-8"/>
+ <source>Save audio</source>
+ <translation>儲存音訊音軌</translation>
 </message>
 <message>
- <source>Cubic interpolation</source>
- <translation type="obsolete">立方內插法</translation>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
+ <source>%d minute(s)</source>
+ <translation>%d 分(s)</translation>
 </message>
 <message>
- <source>Modified ELA</source>
- <translation type="obsolete">改良的 ELA</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+61"/>
+ <source>_Volume control:</source>
+ <translation>_音量控制:</translation>
 </message>
 <message>
- <source>Kernel interpolation</source>
- <translation type="obsolete">內核內插法</translation>
+ <location line="+31"/>
+ <source>Default Postprocessing</source>
+ <translation>預設的後置處理</translation>
 </message>
 <message>
- <source>Modified ELA-2</source>
- <translation type="obsolete">改良的 ELA-2</translation>
+ <location filename="../../common/gui_savenew.cpp" line="-91"/>
+ <location line="+24"/>
+ <source>Cannot create encoder</source>
+ <translation>不能建立編碼器</translation>
 </message>
 <message>
- <source>4 fields check</source>
- <translation type="obsolete">4 圖場檢查</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+18"/>
+ <source>Manual (dB)</source>
+ <translation>手冊 (dB)</translation>
 </message>
 <message>
- <source>5 fields check</source>
- <translation type="obsolete">5 圖場檢查</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+4"/>
+ <source>x86-64</source>
+ <translation>x86-64</translation>
 </message>
 <message>
- <source>4 fields check (no avg)</source>
- <translation type="obsolete">4 圖場檢查 (沒有 avg)</translation>
+ <location filename="../../common/gui_main.cpp" line="+418"/>
+ <source>Checking video</source>
+ <translation>正在檢查影片</translation>
 </message>
 <message>
- <source>5 fields check (no avg)</source>
- <translation type="obsolete">5 圖場檢查 (沒有 avg)</translation>
+ <location filename="../../common/gui_save.cpp" line="+497"/>
+ <source>Saving %s as a BMP file failed.</source>
+ <translation>另存 %s 為 BMP 檔失敗。</translation>
 </message>
 <message>
- <source>No link</source>
- <translation type="obsolete">沒有連結</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-159"/>
+ <source>_Enable alternative keyboard shortcuts</source>
+ <translation>_啟用備用的鍵盤快速鍵</translation>
 </message>
 <message>
- <source>Full link</source>
- <translation type="obsolete">完整連結</translation>
+ <location line="-11"/>
+ <source>Decode video using LIBVA (INTEL)</source>
+ <translation>解碼影片使用 LIBVA (INTEL)</translation>
 </message>
 <message>
- <source>Y to UV</source>
- <translation type="obsolete">Y 轉成 UV</translation>
+ <location filename="../../common/gui_main.cpp" line="-369"/>
+ <source>Cannot open project using the video loader.</source>
+ <translation>使用影片載入器時無法開啟專案。</translation>
 </message>
 <message>
- <source>UV to Y</source>
- <translation type="obsolete">UV 轉成 Y</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+91"/>
+ <source>LIBVA (best)</source>
+ <translation>LIBVA (最好)</translation>
 </message>
 <message>
- <source>0</source>
- <translation type="obsolete">0</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
+ <source>Film to PAL</source>
+ <translation>Film 轉成 PAL</translation>
 </message>
 <message>
- <source>1</source>
- <translation type="obsolete">1</translation>
+ <location filename="../../common/gui_save.cpp" line="-433"/>
+ <source>Select File to Save</source>
+ <translation>選擇檔案進行儲存</translation>
 </message>
 <message>
- <source>2</source>
- <translation type="obsolete">2</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+150"/>
+ <source>_Limit Refresh Rate</source>
+ <translation>_限制重整速率</translation>
 </message>
 <message>
- <source>_Field order:</source>
- <translation type="obsolete">圖場優先順序(_F):</translation>
+ <location filename="../../common/gui_save.cpp" line="-15"/>
+ <source>Select JPEG to Save</source>
+ <translation>選擇 JPG 進行儲存</translation>
 </message>
 <message>
- <source>_Interpolate:</source>
- <translation type="obsolete">插入(_I):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-50"/>
+ <source>Ultra High</source>
+ <translation>超高</translation>
 </message>
 <message>
- <source>_Type:</source>
- <translation type="obsolete">類型(_T):</translation>
+ <source>Fail to save as jpeg</source>
+ <translation type="vanished">失敗另存Jpeg</translation>
 </message>
 <message>
- <source>_MntMode:</source>
- <translation type="obsolete">_Mnt 模式:</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-5"/>
+ <source>Resampling frequency (Hz)</source>
+ <translation>重複取樣頻率 (Hz)</translation>
 </message>
 <message>
- <source>_Link:</source>
- <translation type="obsolete">連結(_L):</translation>
+ <location filename="../../common/gui_main.cpp" line="+629"/>
+ <source>Setting the language for the given track index is not possible: Invalid track index!</source>
+ <translation>設定的語言無法提供跟蹤索引：無效跟蹤指標！</translation>
 </message>
 <message>
- <source>_AP type:</source>
- <translation type="obsolete">_AP 類型:</translation>
+ <source>Cannot decode frame</source>
+ <translation type="vanished">無法解碼幀</translation>
 </message>
 <message>
- <source>Use ch_roma to evalute</source>
- <translation type="obsolete">使用色度來估算(_R)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-172"/>
+ <source>_Default to the directory of the last read file for saving</source>
+ <translation>_預設為儲存最後讀取檔案的目錄</translation>
 </message>
 <message>
- <source>Try _weave</source>
- <translation type="obsolete">嘗試編排(_W)</translation>
+ <location line="+138"/>
+ <source>_Language</source>
+ <translation>_語言</translation>
 </message>
 <message>
- <source>_Denoise</source>
- <translation type="obsolete">減少雜訊(_D)</translation>
+ <location filename="../../common/gui_save.cpp" line="-58"/>
+ <source>No file loaded</source>
+ <translation>沒有檔案載入</translation>
 </message>
 <message>
- <source>_Sharp</source>
- <translation type="obsolete">銳利(_S)</translation>
+ <location filename="../../common/gui_main.cpp" line="-582"/>
+ <source>The file you just loaded contains several audio tracks.
+Go to Audio-&gt;MainTrack to select the active one.</source>
+ <translation>這檔案剛剛載入包含一些音訊軌道。
+前往 音訊-&gt;主要軌道 來選擇作用中的軌道。</translation>
 </message>
 <message>
- <source>_Evalute all frames</source>
- <translation type="obsolete">估算所有的畫格(_E)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-63"/>
+ <source>Video Encoder</source>
+ <translation>影片編碼器</translation>
 </message>
 <message>
- <source>Motion threshold, l_uma:</source>
- <translation type="obsolete">動作臨界值，明度(_U):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+ <source>Threading</source>
+ <translation>線程</translation>
 </message>
 <message>
- <source>Motion threshold, c_hroma:</source>
- <translation type="obsolete">動作臨界值，色度(_H):</translation>
+ <location line="-106"/>
+ <source>_Strength:</source>
+ <translation>_強度:</translation>
 </message>
 <message>
- <source>Area com_bing threshold:</source>
- <translation type="obsolete">範圍梳形濾波臨界值(_B):</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+23"/>
+ <source>Play/Stop</source>
+ <translation>播放/停止</translation>
 </message>
 <message>
- <source>Combe_d threshold:</source>
- <translation type="obsolete">梳形濾波臨界值(_D):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+3"/>
+ <source>Save Job</source>
+ <translation>儲存工作</translation>
 </message>
 <message>
- <source>Artefact _protection threshold:</source>
- <translation type="obsolete">人工保護臨界值(_P):</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-156"/>
+ <source>_Check for new release</source>
+ <translation>_檢查有新版本</translation>
 </message>
 <message>
- <source>Debug:</source>
- <translation type="obsolete">除錯:</translation>
+ <location line="+47"/>
+ <source>_Indexing/unpacking priority:</source>
+ <translation>_索引/拆開打包的優先次序:</translation>
 </message>
 <message>
- <source>_VOB file(s):</source>
- <translation type="obsolete">_VOB 檔:</translation>
+ <location line="+10"/>
+ <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Select VOB file(s)</source>
- <translation type="obsolete">選擇 VOB 檔</translation>
+ <location line="+98"/>
+ <source>De_ringing</source>
+ <translation>去除_環狀色斑</translation>
 </message>
 <message>
- <source>_IFO file:</source>
- <translation type="obsolete">_IFO 檔:</translation>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+12"/>
+ <source>_Deringing</source>
+ <translation>_去除環狀色斑</translation>
 </message>
 <message>
- <source>Select IFO file</source>
- <translation type="obsolete">選擇 IFO 檔</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
+ <source>8-bit PCM</source>
+ <translation>8位元 PCM</translation>
 </message>
 <message>
- <source>VobSub file:</source>
- <translation type="obsolete">VobSub 檔:</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-12"/>
+ <source>Turbo mode</source>
+ <translation>加速模式</translation>
 </message>
 <message>
- <source>Select VobSub file</source>
- <translation type="obsolete">選擇 VobSub 檔</translation>
+ <location line="+68"/>
+ <source>Key Frame Boost(%)</source>
+ <translation>關鍵幀提高(%)</translation>
 </message>
 <message>
- <source>VOB to VobSub</source>
- <translation type="obsolete">VOB 轉成 VobSub</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-149"/>
+ <source>Enable MMX</source>
+ <translation>啟用 MMX</translation>
 </message>
 <message>
- <source>The selected vobfile does not exist</source>
- <translation type="obsolete">選擇的 vob 檔不存在</translation>
+ <location line="+4"/>
+ <source>Enable SSE</source>
+ <translation>啟用 SSE</translation>
 </message>
 <message>
- <source>Please select a correct VobSub path/dir</source>
- <translation type="obsolete">請選擇一個正確的 VobSub 路徑/資料夾</translation>
+ <location line="-17"/>
+ <source>If you use Hw decoding, it is better to use the matching display driver</source>
+ <translation>如果你使用硬體解碼，最好使用匹配的顯示驅動程式</translation>
 </message>
 <message>
- <source>Width and height cannot be 0</source>
- <translation type="obsolete">寬和高不能為 0</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+2"/>
+ <location line="+85"/>
+ <source>filesystem full</source>
+ <translation>檔系統已滿</translation>
 </message>
 <message>
- <source>Width and height cannot be odd</source>
- <translation type="obsolete">寬和高不能為奇數</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+257"/>
+ <location line="+3"/>
+ <source>HW Accel</source>
+ <translation>HW 硬體加速器</translation>
 </message>
 <message>
- <source>Something very wrong happened when building joblist.</source>
- <translation type="obsolete">建立工作列表時發生某些重大錯誤。</translation>
+ <location line="-257"/>
+ <source>_Accept non-standard audio frequency for DVD</source>
+ <translation>_同意在 DVD 使用非標準的音訊頻率</translation>
 </message>
 <message>
- <source>There are no jobs stored</source>
- <translation type="obsolete">沒有儲存任何工作</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-30"/>
+ <source>Chroma ME</source>
+ <translation>色度 ME</translation>
 </message>
 <message>
- <source>Select ECMAScript to Run</source>
- <translation type="obsolete">選擇 ECMAScript 來執行</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+ <source>Enable MMXEXT</source>
+ <translation>啟用 MMXEXT</translation>
 </message>
 <message>
- <source>Obsolete</source>
- <translation type="obsolete">丟棄</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-79"/>
+ <source>Information</source>
+ <translation>屬性</translation>
 </message>
 <message>
- <source>Not coded in this version</source>
- <translation type="obsolete">沒有編進這個版本</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-2"/>
+ <source>NTSC 4:3</source>
+ <translation>NTSC 4:3</translation>
 </message>
 <message>
- <source>Select Video/Image File...</source>
- <translation type="obsolete">選擇視訊/圖像檔案...</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+7"/>
+ <source>Libraries</source>
+ <translation>函式庫</translation>
 </message>
 <message>
- <source>Select Workbench to Save</source>
- <translation type="obsolete">選擇工作台進行儲存</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="-16"/>
+ <source>An audio track is necessary to create such file</source>
+ <translation>音訊軌道有必要建立這樣的檔</translation>
 </message>
 <message>
- <source>Select Raw File to Save</source>
- <translation type="obsolete">選擇 RAW 檔進行儲存</translation>
+ <location filename="../../common/gui_main.cpp" line="+518"/>
+ <source>Cannot use that file as audio track</source>
+ <translation>不能使用該檔作為音訊軌道</translation>
 </message>
 <message>
- <source>Select AVI File...</source>
- <translation type="obsolete">選擇 AVI 檔案...</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+43"/>
+ <source>Prioritisation</source>
+ <translation>優化</translation>
 </message>
 <message>
- <source>Select AVI File to Append...</source>
- <translation type="obsolete">選擇 AVI 檔進行添加...</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+35"/>
+ <source>Max Overglow Degradation(%)</source>
+ <translation>退化最大溢出(%)</translation>
 </message>
 <message>
- <source>Select File to Save Audio</source>
- <translation type="obsolete">選擇檔案來儲存音訊</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+5"/>
+ <source>Built-in Support</source>
+ <translation>內建的支援</translation>
 </message>
 <message>
- <source>Select JPEG Sequence to Save</source>
- <translation type="obsolete">選擇 JPEG 順序進行儲存</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-62"/>
+ <source>Very High</source>
+ <translation>非常高</translation>
 </message>
 <message>
- <source>Select BMP to Save</source>
- <translation type="obsolete">選擇 BMP 進行儲存</translation>
+ <location filename="../../common/gui_main.cpp" line="-1250"/>
+ <source>Select script/project to run</source>
+ <translation>選擇要執行的腳本/專案</translation>
 </message>
 <message>
- <source>Select JPEG to Save</source>
- <translation type="obsolete">選擇 JPG 進行儲存</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+215"/>
+ <source>_Always ask which port to use</source>
+ <translation>_製作影片始終詢問要使用哪個埠(Avidemux+Avisynth)</translation>
 </message>
 <message>
- <source>Select File to Save</source>
- <translation type="obsolete">選擇檔案進行儲存</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+89"/>
+ <source>Go To Marker A</source>
+ <translation>將標記A(選擇開始)</translation>
 </message>
 <message>
- <source>Select MP3 to Load</source>
- <translation type="obsolete">選擇 MP3 進行載入</translation>
+ <location line="+1"/>
+ <source>Go To Marker B</source>
+ <translation>將標記B(選擇結束)</translation>
 </message>
 <message>
- <source>Select AC3 to Load</source>
- <translation type="obsolete">選擇 AC3 進行載入</translation>
+ <source>Could not save all images.</source>
+ <translation type="vanished">無法儲存所有圖像。</translation>
 </message>
 <message>
- <source>Select WAV to Load</source>
- <translation type="obsolete">選擇 WAV 進行載入</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+19"/>
+ <source>Stereo front+stereo rear</source>
+ <translation>前段立體+後段立體</translation>
 </message>
 <message>
- <source>Go to Frame</source>
- <translation type="obsolete">前往畫格</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-53"/>
+ <source>Pr&amp;eferences</source>
+ <translation>首選項&amp;-偏好設定</translation>
 </message>
 <message>
- <source>_Go to frame:</source>
- <translation type="obsolete">前往畫格(_G):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+69"/>
+ <source>Low Bitrate Scenes (%)</source>
+ <translation>低位元率的場景（%）</translation>
 </message>
 <message>
- <source>Out of bounds</source>
- <translation type="obsolete">超過邊界</translation>
+ <location filename="../../common/gui_play.cpp" line="+437"/>
+ <source>Trouble initializing audio device</source>
+ <translation>音訊裝置初始化時發生問題</translation>
 </message>
 <message>
- <source>Marker A &gt; B</source>
- <translation type="obsolete">標記 A &gt; B</translation>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
+ <source>Core has been compiled without XVBA support, but the application has been compiled with it.
+Installation mismatch</source>
+ <translation>核心已編譯，沒有 XVBA 的支援，但它已編譯應用程式，安裝不匹配</translation>
 </message>
 <message>
- <source>An invalid frame range has been selected. Make sure marker A is placed before marker B.</source>
- <translation type="obsolete">選擇了一個無效的畫格範圍。 確認標記 A 位於標記 B 的前面。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-179"/>
+ <source>Video _display:</source>
+ <translation>影片 _顯示:</translation>
 </message>
 <message>
- <source>Cannot copy.</source>
- <translation type="obsolete">無法複製。</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-1"/>
+ <source>High Bitrate Scenes (%)</source>
+ <translation>高位元率場景（%）</translation>
 </message>
 <message>
- <source>Something bad happened (II))</source>
- <translation type="obsolete">不幸的事情發生 (II))</translation>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+ <source>_Vertical deblocking</source>
+ <translation>_去除垂直方向塊狀色斑</translation>
 </message>
 <message>
- <source>Are you sure?</source>
- <translation type="obsolete">確定嗎?</translation>
+ <location filename="../../common/gui_main.cpp" line="+1074"/>
+ <source>Errors found in %u frames</source>
+ <translation>在 %u 幀中發現錯誤</translation>
 </message>
 <message>
- <source>Use custom value</source>
- <translation type="obsolete">使用自訂值</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+ <source>_Local playback downmixing:</source>
+ <translation>_局部倒帶降混合:</translation>
 </message>
 <message>
- <source>Frame Rate</source>
- <translation type="obsolete">畫格率</translation>
+ <location line="-19"/>
+ <source>Display all alerts</source>
+ <translation>顯示所有警告</translation>
 </message>
 <message>
- <source>_Frames per second</source>
- <translation type="obsolete">每秒畫格數(_F)</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-20"/>
+ <source>Fontconfig</source>
+ <translation>Fontconfig</translation>
 </message>
 <message>
- <source>PAL - 25 FPS</source>
- <translation type="obsolete">PAL - 25 FPS</translation>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+33"/>
+ <source>TimeStamp:</source>
+ <translation>時間戳記</translation>
 </message>
 <message>
- <source>FILM - 24 FPS</source>
- <translation type="obsolete">FILM - 24 FPS</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+1"/>
+ <source>FreeType 2</source>
+ <translation>自由型 2</translation>
 </message>
 <message>
- <source>NTSC - 30 FPS</source>
- <translation type="obsolete">NTSC - 30 FPS</translation>
+ <location filename="../../common/gui_main.cpp" line="-576"/>
+ <location line="+21"/>
+ <source>Cutting</source>
+ <translation>剪下</translation>
 </message>
 <message>
- <source>Standard Frame Rate:</source>
- <translation type="obsolete">標準畫格率:</translation>
+ <location filename="../../common/gui_save.cpp" line="+52"/>
+ <source>Select BMP to Save</source>
+ <translation>選擇 BMP 進行儲存</translation>
 </message>
 <message>
- <source>Change Frame Rate</source>
- <translation type="obsolete">改變畫格率</translation>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+27"/>
+ <source>A few seconds</source>
+ <translation>幾秒鐘</translation>
 </message>
 <message>
- <source>Width is not a multiple of 8</source>
- <translation type="obsolete">寬不是 8 的倍數</translation>
+ <location filename="../../common/gui_save.cpp" line="+474"/>
+ <source>File %s has been successfully saved.</source>
+ <translation>檔案 %s 已經成功地儲存。</translation>
 </message>
 <message>
- <source>This will make trouble for AVI files.</source>
- <translation type="obsolete">這將會對 AVI 檔造成故障。</translation>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="-2"/>
+ <source>Less than a minute</source>
+ <translation>不到一分鐘</translation>
 </message>
 <message>
- <source>Rebuild all Keyframes?</source>
- <translation type="obsolete">重新建立所有的關鍵畫格?</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+48"/>
+ <source>Next Black Frame</source>
+ <translation>轉到下一幀黑框</translation>
 </message>
 <message>
- <source>Permission error</source>
- <translation type="obsolete">權限許可錯誤</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+ <source>Display</source>
+ <translation>顯示</translation>
 </message>
 <message>
- <source>&quot;%s&quot; does not exist.</source>
- <translation type="obsolete">&quot;%s&quot; 不存在。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+3"/>
+ <source>Go to Time</source>
+ <translation>前往時間點</translation>
 </message>
 <message>
- <source>Error opening file</source>
- <translation type="obsolete">開啟檔案錯誤</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+7"/>
+ <source>Go To Time</source>
+ <translation>前往時間點</translation>
 </message>
 <message>
- <source>Error opening &quot;%s&quot;.</source>
- <translation type="obsolete">開啟 &quot;%s&quot; 錯誤。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-210"/>
+ <source>Multi-threading</source>
+ <translation>多線程</translation>
 </message>
 <message>
- <source>Cannot open project using the video loader.</source>
- <translation type="obsolete">使用視訊載入器時無法開啟專案。</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+12"/>
+ <source>Xvid4 Configuration</source>
+ <translation>Xvid4 配置</translation>
 </message>
 <message>
- <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
- <translation type="obsolete">嘗試 &apos;檔案&apos; -&gt; &apos;載入/執行 專案...&apos;</translation>
+ <location line="-62"/>
+ <source>Advanced Simple Profile</source>
+ <translation>進階簡單設定檔(ASP)</translation>
 </message>
 <message>
- <source>Could not open the file</source>
- <translation type="obsolete">無法開啟此檔案</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-2"/>
+ <source>Stereo+center</source>
+ <translation>立體+中央</translation>
 </message>
 <message>
- <source>Multiple Audio Tracks</source>
- <translation type="obsolete">多音軌</translation>
+ <location line="-11"/>
+ <source>PAL to Film</source>
+ <translation>PAL 轉成 Film</translation>
 </message>
 <message>
- <source>The file you just loaded contains several audio tracks.
-Go to Audio-&gt;MainTrack to select the active one.</source>
- <translation type="obsolete">這檔案剛剛載入包含一些音訊軌道。
-前往 音訊-&gt;主要軌道 來選擇作用中的軌道。</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
+ <source>Reset Markers</source>
+ <translation>取消標記</translation>
 </message>
 <message>
- <source>No audio decoder found for this file</source>
- <translation type="obsolete">沒有找到可對應這個檔案的音訊解碼器</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+230"/>
+ <source>Default port to use</source>
+ <translation>製作影片要使用預設埠(Avidemux)</translation>
 </message>
 <message>
- <source>Save (A+V) will generate bad AVI. Save audio will work.</source>
- <translation type="obsolete">儲存 (A+V) 將會生成壞的 AVI。儲存音訊將會進行。</translation>
+ <location line="-147"/>
+ <source>_Message level:</source>
+ <translation>_訊息等級:</translation>
 </message>
 <message>
- <source>Something failed when appending</source>
- <translation type="obsolete">當添加時某些事情失敗</translation>
+ <location filename="../../common/gui_main.cpp" line="+576"/>
+ <source>You can&apos;t remove all frames</source>
+ <translation>你不&apos;能移除所有的幀</translation>
 </message>
 <message>
- <source>Something bad happened (II)</source>
- <translation type="obsolete">不幸的事情發生 (II)</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+32"/>
+ <source>&amp;Advanced</source>
+ <translation>&amp;進階</translation>
 </message>
 <message>
- <source>Cannot save the audio in copy mode</source>
- <translation type="obsolete">無法在複製模式儲存此音訊</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-128"/>
+ <source>Enable openGl support</source>
+ <translation>啟用openGl支援</translation>
 </message>
 <message>
- <source>Select WAV PCM as the audio codec, otherwise the audio file would be raw PCM.</source>
- <translation type="obsolete">選擇 WAV PCM 作為音訊編解碼器，另外音訊檔是未處理過的 PCM。</translation>
+ <location filename="../../common/gui_main.cpp" line="-859"/>
+ <source>tinyPy script is not enabled in this build</source>
+ <translation>在生成中未啟用 tinyPy 腳本</translation>
 </message>
 <message>
- <source>Saving audio</source>
- <translation type="obsolete">正在儲存音訊</translation>
+ <location filename="../../common/gui_savenew.cpp" line="-8"/>
+ <source>Cannot setup codec. Bitrate too low?</source>
+ <translation>無法安裝編解碼器，位元率太低？</translation>
 </message>
 <message>
- <source>Get Frame</source>
- <translation type="obsolete">取得畫格</translation>
+ <location filename="../../common/gui_save.cpp" line="-511"/>
+ <source>Output file</source>
+ <translation>輸出檔案</translation>
 </message>
 <message>
- <source>Cannot get this frame to save</source>
- <translation type="obsolete">無法取得此畫格進行儲存</translation>
+ <location filename="../../common/gui_main.cpp" line="-25"/>
+ <location line="+68"/>
+ <source>Select Video File...</source>
+ <translation>選擇影片檔...</translation>
 </message>
 <message>
- <source>Mark A &gt; B</source>
- <translation type="obsolete">標記 A &gt; B</translation>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+3"/>
+ <source>Unknown codec</source>
+ <translation>未知的編解碼器</translation>
 </message>
 <message>
- <source>Set your markers correctly.</source>
- <translation type="obsolete">正確地設定你的標記。</translation>
+ <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="-3"/>
+ <source>Select Video To Write</source>
+ <translation>選擇影片來寫入</translation>
 </message>
 <message>
- <source>Saving as set of jpegs</source>
- <translation type="obsolete">正在另存為整套 jpeg 檔</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+114"/>
+ <source>Demuxers</source>
+ <translation>分離器</translation>
 </message>
 <message>
- <source>Cannot decode frame</source>
- <translation type="obsolete">無法解碼畫格</translation>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
+ <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+7"/>
+ <source>Unknown</source>
+ <translation>未知</translation>
 </message>
 <message>
- <source>Aborting.</source>
- <translation type="obsolete">正在中止。</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-44"/>
+ <source>Reset Edit</source>
+ <translation>取消編輯</translation>
 </message>
 <message>
- <source>Done</source>
- <translation type="obsolete">完成</translation>
+ <location line="+16"/>
+ <source>Save current settings as default</source>
+ <translation>將當前設置儲存為預設值</translation>
 </message>
 <message>
- <source>Saved %d images.</source>
- <translation type="obsolete">已儲存 %d 個圖像。</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-28"/>
+ <source>C_hroma optimizer</source>
+ <translation>色度_優化器</translation>
 </message>
 <message>
- <source>Error</source>
- <translation type="obsolete">錯誤</translation>
+ <location line="+6"/>
+ <source>Very Low</source>
+ <translation>非常慢</translation>
 </message>
 <message>
- <source>Could not save all images.</source>
- <translation type="obsolete">無法儲存所有圖像。</translation>
+ <location filename="../../common/gui_autodrive.cpp" line="+62"/>
+ <source>The MP3 codec does not allow disabling reservoir.
+Install lame plugin</source>
+ <translation>MP3 編解碼器不允許停用資源，安裝了 lame外掛程式</translation>
 </message>
 <message>
- <source>Saved &quot;%s&quot;.</source>
- <translation type="obsolete">已儲存 &quot;%s&quot;。</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
+ <source>Save as Image</source>
+ <translation>另存圖片</translation>
 </message>
 <message>
- <source>BMP op failed</source>
- <translation type="obsolete">BMP 運算失敗</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+285"/>
+ <source>Preferences</source>
+ <translation>首選項-偏好設定</translation>
 </message>
 <message>
- <source>Saving %s as a BMP file failed.</source>
- <translation type="obsolete">另存 %s 為 BMP 檔失敗。</translation>
+ <location filename="../../common/gui_main.cpp" line="+912"/>
+ <source>_Track from video:</source>
+ <translation>_影片中的軌道:</translation>
 </message>
 <message>
- <source>Failed to open the file</source>
- <translation type="obsolete">無法開啟此檔案</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+19"/>
+ <source>Quarter Pixel</source>
+ <translation>1/4像素</translation>
 </message>
 <message>
- <source>Not a WAV file?</source>
- <translation type="obsolete">不是一個 WAV 檔?</translation>
+ <location filename="../../common/gui_save.cpp" line="+120"/>
+ <source>Saving audio</source>
+ <translation>正在儲存音訊</translation>
 </message>
 <message>
- <source>WAV open file failed...</source>
- <translation type="obsolete">WAV 開啟檔案失敗...</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-221"/>
+ <source>_Use alternative tag for MP3 in .mp4</source>
+ <translation>_在 .mp4 對 MP3 使用選擇對象標籤</translation>
 </message>
 <message>
- <source>Cannot decompress audio frame</source>
- <translation type="obsolete">無法解壓音訊框架</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-29"/>
+ <source>_Interlaced</source>
+ <translation>_交錯掃描</translation>
 </message>
 <message>
- <source>Memory Error</source>
- <translation type="obsolete">記憶體錯誤</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+75"/>
+ <source>Open Application &amp;Log</source>
+ <translation>開啟應用程式 &amp;Log</translation>
 </message>
 <message>
- <source>No frames to encode</source>
- <translation type="obsolete">沒有畫格進行編碼</translation>
+ <location filename="../../common/gui_save.cpp" line="+99"/>
+ <source>Function not implemented
+</source>
+ <translation>函數尚未執行</translation>
 </message>
 <message>
- <source>Please check markers. Is &quot;A&gt;&quot; == &quot;&gt;B&quot;?</source>
- <translation type="obsolete">請檢查標記。 是 &quot;A&gt;&quot; == &quot;&gt;B&quot;?</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-20"/>
+ <location line="+9"/>
+ <source>Filters</source>
+ <translation>濾鏡器</translation>
 </message>
 <message>
- <source>Saving raw video stream</source>
- <translation type="obsolete">儲存待處理的視訊串流</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-21"/>
+ <source>_lavc threads:</source>
+ <translation>_lavc 線程:</translation>
 </message>
 <message>
- <source>Checking video</source>
- <translation type="obsolete">正在檢查視訊</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+60"/>
+ <source>Quantization Matrix</source>
+ <translation>量化矩陣</translation>
 </message>
 <message>
- <source>No error found</source>
- <translation type="obsolete">沒有找到錯誤</translation>
+ <location line="-58"/>
+ <source>_Greyscale</source>
+ <translation>_灰階</translation>
 </message>
 <message>
- <source>Errors found in %u frames</source>
- <translation type="obsolete">在 %u 畫格中發現錯誤</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+195"/>
+ <source>Refresh Rate Cap (ms)</source>
+ <translation>重整速率上限 (ms)</translation>
 </message>
 <message>
- <source>Cannot decompress the audio stream</source>
- <translation type="obsolete">無法解壓此音訊串流</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-24"/>
+ <source>Set Marker A</source>
+ <translation>設定標記 A</translation>
 </message>
 <message>
- <source>Switch audio codec to Copy.</source>
- <translation type="obsolete">切換音訊編解碼器為複製。</translation>
+ <location line="+1"/>
+ <source>Set Marker B</source>
+ <translation>設定標記 B</translation>
 </message>
 <message>
- <source>Cannot delete the selection.</source>
- <translation type="obsolete">無法刪除此選取範圍。</translation>
+ <location filename="../../common/gui_main.cpp" line="+32"/>
+ <location line="+7"/>
+ <source>Invalid audio index given</source>
+ <translation>提供的音訊索引無效</translation>
 </message>
 <message>
- <source>You can&apos;t remove all frames</source>
- <translation type="obsolete">你不能移除所有的畫格</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+22"/>
+ <source>VHQ Mode</source>
+ <translation>VHQ 模式</translation>
 </message>
 <message>
- <source>Something bad happened</source>
- <translation type="obsolete">不幸的事情發生</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+24"/>
+ <source>Automatic (max -3 dB)</source>
+ <translation>自動 (最大值 -3 dB)</translation>
 </message>
 <message>
- <source>Could not get tracks info</source>
- <translation type="obsolete">無法取得軌道資訊</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-23"/>
+ <source>Ca_rtoon mode</source>
+ <translation>卡通_模式</translation>
 </message>
 <message>
- <source>Take audio from video file</source>
- <translation type="obsolete">從影片取得音訊</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+46"/>
+ <source>Previous Frame</source>
+ <translation>轉到上一幀</translation>
 </message>
 <message>
- <source>No audio</source>
- <translation type="obsolete">沒有音訊</translation>
+ <location filename="../../common/gui_main.cpp" line="+225"/>
+ <source>AvsProxy</source>
+ <translation>AvsProxy</translation>
 </message>
 <message>
- <source>External AC3</source>
- <translation type="obsolete">外部的 AC3</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-181"/>
+ <source>_Playback priority:</source>
+ <translation>_倒帶優先次序:</translation>
 </message>
 <message>
- <source>Take audio from external AC3 file</source>
- <translation type="obsolete">從外部的 AC3 檔取得音訊</translation>
+ <location filename="../../common/gui_main.cpp" line="+5"/>
+ <source>avsproxy</source>
+ <translation>AvsProxy</translation>
 </message>
 <message>
- <source>External MP3</source>
- <translation type="obsolete">外部的 MP3</translation>
+ <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+105"/>
+ <source>_Horizontal deblocking</source>
+ <translation>_去除水平方向塊狀色斑</translation>
 </message>
 <message>
- <source>Take audio from external MP3 file</source>
- <translation type="obsolete">從外部的 MP3 檔取得音訊</translation>
+ <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
+ <source>Updating frametype</source>
+ <translation>更新幀類型</translation>
 </message>
 <message>
- <source>External WAV</source>
- <translation type="obsolete">外部的 WAV</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-21"/>
+ <source>_Frame rate change:</source>
+ <translation>_幀率改變:</translation>
 </message>
 <message>
- <source>Take audio from external WAV file</source>
- <translation type="obsolete">從外部的 WAV 檔取得音訊</translation>
+ <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+1"/>
+ <source>Gettext</source>
+ <translation>Gettext</translation>
 </message>
 <message>
- <source>_Audio source:</source>
- <translation type="obsolete">音訊來源(_A):</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-84"/>
+ <source>Save as JPEG</source>
+ <translation>另存JPEG</translation>
 </message>
 <message>
- <source>_External file:</source>
- <translation type="obsolete">外部檔案(_E):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+86"/>
+ <source>Two Pass</source>
+ <translation>2通</translation>
 </message>
 <message>
- <source>Select file</source>
- <translation type="obsolete">選擇檔案</translation>
+ <location filename="../../common/gui_main.cpp" line="-770"/>
+ <source>Could not open the file</source>
+ <translation>無法開啟此檔案</translation>
 </message>
 <message>
- <source>Audio track %d (%s/%d channels/%d kbit per s/%d ms shift)</source>
- <translation type="obsolete">音軌 %d (%s/%d 聲道每 s/%d ms 位移 /%d kbit )</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-26"/>
+ <source>Trellis Quantization</source>
+ <translation>網格量化</translation>
 </message>
 <message>
- <source>_Track from video:</source>
- <translation type="obsolete">影片中的軌道(_T):</translation>
+ <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-41"/>
+ <source>Memory error</source>
+ <translation>記憶體錯誤</translation>
 </message>
 <message>
- <source>Main Audio Track</source>
- <translation type="obsolete">主要音軌</translation>
+ <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+11"/>
+ <source>5 channels</source>
+ <translation>5 聲道</translation>
 </message>
 <message>
- <source>Cannot load</source>
- <translation type="obsolete">無法載入</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+13"/>
+ <source>.. are reduced by(%)</source>
+ <translation>介...是減少(%)。</translation>
 </message>
 <message>
- <source>The selected audio file does not exist.</source>
- <translation type="obsolete">選取的音訊檔不存在。</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
+ <source>Previous Intra Frame</source>
+ <translation>轉到上一幀(關鍵幀或I幀)</translation>
 </message>
 <message>
- <source>Second Audio Track</source>
- <translation type="obsolete">第二音軌</translation>
+ <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+16"/>
+ <source>System language</source>
+ <translation>系統語言</translation>
 </message>
 <message>
- <source>Error loading the MP3 file</source>
- <translation type="obsolete">載入 MP3 檔案錯誤</translation>
+ <location line="-107"/>
+ <source>XVideo (best)</source>
+ <translation>XVideo (最好)</translation>
 </message>
 <message>
- <source>Second track loaded</source>
- <translation type="obsolete">已載入第二軌道</translation>
+ <location filename="../../common/gui_main.cpp" line="+269"/>
+ <location line="+43"/>
+ <source>The tinypy plugin is missing.
+Expect problems.</source>
+ <translation>Tinypy 外掛程式是錯誤，期望的問題。</translation>
 </message>
 <message>
- <source>Error loading the AC3 file</source>
- <translation type="obsolete">載入 AC3 檔案錯誤</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-29"/>
+ <source>Audio Encoders</source>
+ <translation>音訊編碼器</translation>
 </message>
 <message>
- <source>Error loading the WAV file</source>
- <translation type="obsolete">載入 WAV 檔案錯誤</translation>
+ <location filename="../../common/gui_main.cpp" line="-160"/>
+ <location line="+268"/>
+ <source>Something bad happened (II)</source>
+ <translation>不幸的事情發生 (II)</translation>
 </message>
 <message>
+ <location filename="../../common/gui_save.cpp" line="+28"/>
 <source>Saving failed</source>
- <translation type="obsolete">儲存失敗</translation>
+ <translation>儲存失敗</translation>
 </message>
 <message>
- <source>Saving the job failed. Maybe you have permission issue with ~/.avidemux</source>
- <translation type="obsolete">儲存工作失敗。可能你沒有權限寫入 ~/.avidemux</translation>
+ <location line="-220"/>
+ <source>Select File to Save Audio</source>
+ <translation>選擇檔案來儲存音訊</translation>
 </message>
 <message>
- <source>File %s has been successfully saved.</source>
- <translation type="obsolete">檔案 %s 已經成功地儲存。</translation>
+ <location filename="../../common/gui_main.cpp" line="+168"/>
+ <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
+ <translation>未找到在清單中，即使它應該有的音訊檔，建立一個錯誤報告！</translation>
 </message>
 <message>
- <source>File %s was NOT saved correctly.</source>
- <translation type="obsolete">檔案 %s 儲存不正確。</translation>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
+ <source>PostProcessing</source>
+ <translation>後置處理</translation>
 </message>
 <message>
- <source>AvsProxy</source>
- <translation type="obsolete">AvsProxy</translation>
+ <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="-18"/>
+ <source>%d hour(s)</source>
+ <translation>%d 時(s)</translation>
 </message>
 <message>
- <source>Failed to connect to avsproxy.
-Is it running ?</source>
- <translation type="obsolete">無法連線到 avsproxy。
-要繼續執行嗎?</translation>
+ <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-138"/>
+ <source>Audio Plugins</source>
+ <translation>外掛-音訊(ADM)</translation>
 </message>
 <message>
- <source>avsproxy</source>
- <translation type="obsolete">avsproxy</translation>
+ <location filename="../../common/gui_save.cpp" line="+502"/>
+ <source>Cannot get tinyPÿ script engine</source>
+ <translation>不能獲得tinyPÿ腳本引擎</translation>
 </message>
 <message>
- <source>Frame type:</source>
- <translation type="obsolete">畫格類型:</translation>
+ <source>Saving as set of jpegs</source>
+ <translation type="vanished">正在另存為整套 jpeg 檔</translation>
 </message>
 <message>
- <source>Frame size:</source>
- <translation type="obsolete">畫格大小:</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+6"/>
+ <source>Curve Compression</source>
+ <translation>曲線壓縮</translation>
 </message>
 <message>
- <source>Frame Hex Dump</source>
- <translation type="obsolete">畫格二位元轉出(_F)</translation>
+ <location line="-60"/>
+ <source>Mode Decision</source>
+ <translation>模式決定</translation>
 </message>
 <message>
- <source>Decompressing error</source>
- <translation type="obsolete">解壓錯誤</translation>
+ <location filename="../../common/gui_save.cpp" line="-525"/>
+ <source>Queue job to jobList</source>
+ <translation>工作清單</translation>
 </message>
 <message>
- <source>Cannot decode next frame.</source>
- <translation type="obsolete">無法解碼下一個畫格。</translation>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+35"/>
+ <source>Internal error opening 0x%x</source>
+ <translation>內部開啟錯誤中 0x%x</translation>
 </message>
 <message>
- <source>Cannot decode keyframe.</source>
- <translation type="obsolete">無法解碼關鍵畫格。</translation>
+ <location filename="../../common/gui_main.cpp" line="-827"/>
+ <source>Are you sure?</source>
+ <translation>確定嗎?</translation>
 </message>
 <message>
- <source>Seeking</source>
- <translation type="obsolete">搜尋中</translation>
+ <location filename="../../common/ADM_editor/src/ADM_edVideoCopy.cpp" line="+449"/>
+ <source>Decode time stamp (DTS) collision affecting a keyframe at %s detected.
+Dropping a keyframe will result in severely corrupted video.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Finding black frames</source>
- <translation type="obsolete">正在尋找黑畫面</translation>
+ <location line="+6"/>
+ <source>Decode time stamp (DTS) collision affecting a frame at %s detected.
+Dropping a frame may result in some video corruption.
+Proceed anyway?</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Cannot decode the frame.</source>
- <translation type="obsolete">無法解碼此畫格。</translation>
+ <location line="+20"/>
+ <source>Do not warn again and drop frames silently while saving this video?</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Dual audio can only be used in copy mode</source>
- <translation type="obsolete">雙語只可以使用於複製模式</translation>
+ <location line="+76"/>
+ <source>While saving, some video frames prior to %s had to be delayed, resulting in temporary loss of A/V sync. Would you like to continue nevertheless?</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Select Copy as the video codec.</source>
- <translation type="obsolete">選擇複製作為視訊編解碼器。</translation>
+ <location filename="../../common/ADM_toolkit/automation.cpp" line="+227"/>
+ <source>Permission Error</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Incompatible output format</source>
- <translation type="obsolete">不相容的輸出格式</translation>
+ <location line="+0"/>
+ <source>Cannot open script &quot;%s&quot;.</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>There is no second track</source>
- <translation type="obsolete">沒有第二軌道</translation>
+ <location line="+4"/>
+ <source>File Error</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Select a second audio track in the Audio menu.</source>
- <translation type="obsolete">在音訊選單中選擇一的第二音軌。</translation>
+ <location line="+0"/>
+ <source>Script &quot;%s&quot; does not exist.</source>
+ <translation type="unfinished"></translation>
 </message>
+</context>
+<context>
+ <name>admIvtc</name>
 <message>
- <source>Select dual audio AVI to write</source>
- <translation type="obsolete">選擇雙語 AVI 進行寫入</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+44"/>
+ <source>All in one ivtc.</source>
+ <translation>ADM ivtc:開放組織框架構的IVTC全功能合一交錯濾鏡器。</translation>
 </message>
 <message>
- <source>This cannot have packed VOP</source>
- <translation type="obsolete">這個無法包含打包好的 VOP</translation>
+ <location line="-1"/>
+ <source>ADM ivtc.</source>
+ <translation>2.0-ADM ivtc多功能合一交錯濾鏡器</translation>
 </message>
+</context>
+<context>
+ <name>aften</name>
 <message>
- <source>It is not MPEG-4 video. File will not be saved.</source>
- <translation type="obsolete">這不是 MPEG-4 影片。無法儲存檔案。</translation>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
+ <source>_Bitrate:</source>
+ <translation>_位元率:</translation>
 </message>
 <message>
- <source>You may need smart copy.
-Enable it?</source>
- <translation type="obsolete">您可能需要智慧型複製。(new line)
-啟用它嗎?</translation>
+ <location line="+6"/>
+ <source>Aften Configuration</source>
+ <translation>經常配置</translation>
 </message>
+</context>
+<context>
+ <name>asciiView</name>
 <message>
- <source>Smart Copy</source>
- <translation type="obsolete">智慧型複製</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+ <source>Ascii View</source>
+ <translation>1.5-ASCII視圖(美國資訊交換標準代碼)</translation>
 </message>
 <message>
- <source>_Q factor (set 4):</source>
- <translation type="obsolete">_Q 係數 (設定為 4):</translation>
+ <location line="+1"/>
+ <source>Ascii view</source>
+ <translation>ASCII視圖(美國資訊交換標準代碼)</translation>
 </message>
+</context>
+<context>
+ <name>asfdemuxer</name>
 <message>
- <source>Trouble initializing audio device</source>
- <translation type="obsolete">音訊裝置初始化時發生問題</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
+ <source>File Error.</source>
+ <translation>檔案錯誤</translation>
 </message>
 <message>
- <source>[BuildChain] Encoder initialization failed</source>
- <translation type="obsolete">[建立鏈] 編碼器初始化失敗</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+471"/>
+ <source>Indexing</source>
+ <translation>正在索引</translation>
 </message>
 <message>
- <source>Internal error finding codec</source>
- <translation type="obsolete">尋找編解碼器時內部發生錯誤</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+0"/>
+ <source>Cannot open file
+</source>
+ <translation>不能開啟檔案</translation>
 </message>
+</context>
+<context>
+ <name>asharp</name>
 <message>
- <source>AMR-WB</source>
- <translation type="obsolete">AMR-WB</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="+65"/>
+ <source>Asharp</source>
+ <translation>5.2-自適應銳化(Asharp)</translation>
 </message>
 <message>
- <source>Reuse the existing log file?</source>
- <translation type="obsolete">重複使用現有的日誌檔?</translation>
+ <location line="+1"/>
+ <source>Adaptative sharpener by MarcFD.</source>
+ <translation>適性銳利化器，作者為 MarcFD。</translation>
 </message>
+</context>
+<context>
+ <name>asharpDialog</name>
 <message>
- <source>Audio Plugins</source>
- <translation type="obsolete">音訊外掛模組</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui" line="+14"/>
+ <source>ASharp</source>
+ <translation>5.2-自適應銳化(Asharp)</translation>
 </message>
 <message>
- <source>Video Encoder Plugins</source>
- <translation type="obsolete">視訊編碼器外掛模組</translation>
+ <location line="+110"/>
+ <source>Threshold</source>
+ <translation>界限值</translation>
 </message>
 <message>
- <source>Video Encoder</source>
- <translation type="obsolete">視訊編碼器</translation>
+ <location line="-47"/>
+ <source>Unknown flag</source>
+ <translation>未知的標誌</translation>
 </message>
 <message>
- <source>Audio Device Plugins</source>
- <translation type="obsolete">音訊裝置外掛模組</translation>
+ <location line="+60"/>
+ <source>Strength</source>
+ <translation>強度</translation>
 </message>
 <message>
- <source>Audio Device</source>
- <translation type="obsolete">音訊裝置</translation>
+ <location line="-33"/>
+ <source>Block Adaptative</source>
+ <translation>區塊適性</translation>
 </message>
+</context>
+<context>
+ <name>ass</name>
 <message>
- <source>Audio Encoder Plugins</source>
- <translation type="obsolete">音訊編碼器外掛模組</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+179"/>
+ <source>ASS</source>
+ <translation>ASS</translation>
 </message>
 <message>
- <source>Audio Encoders</source>
- <translation type="obsolete">音訊編碼器</translation>
+ <location line="+14"/>
+ <location line="+5"/>
+ <location line="+8"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <source>Plugins Info</source>
- <translation type="obsolete">外掛模組資訊</translation>
+ <location line="+55"/>
+ <source>Fonts</source>
+ <translation>字型</translation>
 </message>
 <message>
- <source>_AudioDevice</source>
- <translation type="obsolete">音訊裝置(_A)</translation>
+ <location line="-68"/>
+ <source>Cannot load this srt file.</source>
+ <translation>不能載入srt檔</translation>
 </message>
 <message>
- <source>Audio filters cannot be applied in Copy mode</source>
- <translation type="obsolete">在複製模式無法套用音訊濾鏡</translation>
+ <location line="-7"/>
+ <source>This is a srt file. Convert to SSA ?</source>
+ <translation>這是一個 srt 檔，將轉換為 SSA？</translation>
 </message>
 <message>
- <source>To apply filters the audio must be transcoded.</source>
- <translation type="obsolete">音訊必須轉碼才能套用濾鏡。</translation>
+ <location line="-11"/>
+ <source>Botto_m margin</source>
+ <translation>底_部邊界</translation>
 </message>
 <message>
- <source>Video filters cannot be applied in Copy mode</source>
- <translation type="obsolete">在複製模式無法套用視訊濾鏡</translation>
+ <location line="-2"/>
+ <source>_Font scale:</source>
+ <translation>_字體縮放:</translation>
 </message>
 <message>
- <source>To apply filters the video must be transcoded.</source>
- <translation type="obsolete">視訊必須轉碼才能套用濾鏡。</translation>
+ <location line="-43"/>
+ <source>Are you sure this is an ass file ?</source>
+ <translation>你確認是ass檔嗎?</translation>
 </message>
 <message>
- <source>Not activated, make sure number of channels and bitrate are compatible with encoder!</source>
- <translation type="obsolete">沒有作用，請確認聲道數和位元率能與編碼器相容!</translation>
+ <location line="+158"/>
+ <source>SSA Error</source>
+ <translation>SSA錯誤</translation>
 </message>
 <message>
- <source>Blend Removal</source>
- <translation type="obsolete">去除混合</translation>
+ <location line="-117"/>
+ <source>Select Subtitle file</source>
+ <translation>選擇字幕檔</translation>
 </message>
-</context>
-<context>
- <name>ADMImage</name>
 <message>
- <source>Memory error</source>
- <translation type="obsolete">記憶體錯誤</translation>
+ <location line="+117"/>
+ <source>Cannot read_file for *%s*</source>
+ <translation>無法讀取_檔案為 * %s *</translation>
 </message>
 <message>
- <source>Error converting to BMP</source>
- <translation type="obsolete">無法轉成 BMP</translation>
+ <location line="-116"/>
+ <source>_Line spacing:</source>
+ <translation>_行距:</translation>
 </message>
 <message>
- <source>Something bad happened</source>
- <translation type="obsolete">發生錯誤</translation>
+ <location line="+89"/>
+ <source>Preparing the fonts can take a few minutes the first time.
+This message will not be displayed again.</source>
+ <translation>準備的字體可以花幾分鐘第一次，不會再顯示此消息。</translation>
 </message>
 <message>
- <source>Cannot encode the frame</source>
- <translation type="obsolete">此畫格無法編碼</translation>
+ <location line="-87"/>
+ <source>_Top margin:</source>
+ <translation>_頂部邊界:</translation>
 </message>
 <message>
- <source>File error</source>
- <translation type="obsolete">檔案錯誤</translation>
+ <location line="-44"/>
+ <source>Format ?</source>
+ <translation>格式 ?</translation>
 </message>
 <message>
- <source>Cannot open &quot;%s&quot; for writing.</source>
- <translation type="obsolete">無法開啟 &quot;%s&quot; 進行寫入。</translation>
+ <location line="-63"/>
+ <source>SSA/ASS/SRT</source>
+ <translation>6.1-字型檔SSA/ASS/SRT副檔名格式</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoComputeAverage</name>
 <message>
- <source>_Start Frame (first frame # to include in average):</source>
- <translation type="obsolete">起始畫格(在平均值包含第一個畫格 #)(_S):</translation>
+ <location line="+104"/>
+ <source>_Subtitle file (ASS/SSA):</source>
+ <translation>_字幕檔(ASS/SSA):</translation>
 </message>
 <message>
- <source>_End Frame (last frame # to include), -1 = last:</source>
- <translation type="obsolete">結束畫格 (包含最後一個畫格 #), -1 = 最後(_E):</translation>
+ <location line="+27"/>
+ <source>Cannot convert to ssa.</source>
+ <translation>不能轉換ssa檔</translation>
 </message>
 <message>
- <source>_Output File:</source>
- <translation type="obsolete">輸出檔案(_O):</translation>
+ <location line="-130"/>
+ <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+ <translation>編碼-副檔名相容的.ass/.ssa/.srt字幕，請匯入文字檔。</translation>
 </message>
 <message>
- <source>Select output file</source>
- <translation type="obsolete">選擇輸出檔案</translation>
+ <location line="+138"/>
+ <source>Cannot save converted file.</source>
+ <translation>不能儲存轉換檔</translation>
 </message>
+</context>
+<context>
+ <name>avimuxer</name>
 <message>
- <source>_Bias (only for display; use 0 for average, 128 for frame minus average):</source>
- <translation type="obsolete">偏向 (僅用於顯示；使用 0 於平均值，128 於畫格減去平均值)(_B):</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+ <source>Muxing Format</source>
+ <translation>複合格式</translation>
 </message>
 <message>
- <source>Current frame minus average so far</source>
- <translation type="obsolete">目前為止當前畫格的負差平均值</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+84"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <source>Average so far</source>
- <translation type="obsolete">目前為止的平均值</translation>
+ <location line="+0"/>
+ <source>Cannot create AVI file</source>
+ <translation>不能建立AVI檔</translation>
 </message>
 <message>
- <source>Display nothing (fast for batch processing)</source>
- <translation type="obsolete">無任何顯示 (對批次處理而言是快速的)</translation>
+ <location line="-10"/>
+ <source>Bad Idea</source>
+ <translation>壞主意</translation>
 </message>
 <message>
- <source>Display _Mode:</source>
- <translation type="obsolete">顯示模式(_M):</translation>
+ <location line="+0"/>
+ <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
+ Do you want to continue anyway ?</source>
+ <translation>使用H264/H265中AVI是個壞主意，MKV是好了點，你想要繼續嗎？</translation>
 </message>
 <message>
- <source>ComputeAverage</source>
- <translation type="obsolete">計算平均值</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+3"/>
+ <source>Avi Muxer</source>
+ <translation>AVI 複合器選項</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoDenoise</name>
+ <name>avsfilter</name>
 <message>
- <source>_Luma lock:</source>
- <translation type="obsolete">明度鎖定(_L):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+599"/>
+ <source>Select wine filename[wine/cedega/etc.]</source>
+ <translation>選擇wine檔案名 [cedega/wine/等]。</translation>
 </message>
 <message>
- <source>C_hroma lock:</source>
- <translation type="obsolete">色度鎖定(_H):</translation>
+ <location line="-1"/>
+ <source>_wine app file:</source>
+ <translation>_wine用程式檔：</translation>
 </message>
 <message>
- <source>L_uma threshold:</source>
- <translation type="obsolete">明度臨界值(_U):</translation>
+ <location line="+3"/>
+ <source>_loader file:</source>
+ <translation>_載入程式檔：</translation>
 </message>
 <message>
- <source>Ch_roma threshold:</source>
- <translation type="obsolete">色度臨界值(_R):</translation>
+ <location line="+1"/>
+ <source>Select loader filename[avsload.exe]</source>
+ <translation>選擇載入檔案名稱[avs載入.exe]</translation>
 </message>
 <message>
- <source>_Scene change:</source>
- <translation type="obsolete">場景變換(_S):</translation>
+ <location line="+2"/>
+ <source>_avs file:</source>
+ <translation>_avs 檔:</translation>
 </message>
 <message>
- <source>Denoise</source>
- <translation type="obsolete">減少雜訊</translation>
+ <location line="+2"/>
+ <source>_pipe timeout:</source>
+ <translation>_管超時：</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoDropOut</name>
 <message>
- <source>DropOut Threshold</source>
- <translation type="obsolete">脫離臨界值</translation>
+ <location line="+4"/>
+ <source>AvsFilter config</source>
+ <translation>Avs濾鏡器配置</translation>
 </message>
 <message>
- <source>Drop Out</source>
- <translation type="obsolete">脫離</translation>
+ <location line="-5"/>
+ <source>Select avs filename[*.avs]</source>
+ <translation>選擇 avs 檔名[*.avs]</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoEraser</name>
+ <name>bitrate</name>
 <message>
- <source>Erase</source>
- <translation type="obsolete">擦除</translation>
+ <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+168"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location line="-116"/>
+ <source>Same Quantiser as Input</source>
+ <translation>量化值與輸入來源相同</translation>
 </message>
 <message>
- <source>Un-Erase</source>
- <translation type="obsolete">未擦除</translation>
+ <location line="+3"/>
+ <source>Two Pass - Average Bitrate</source>
+ <translation>2通 - 平均位元率(ABR)</translation>
 </message>
 <message>
- <source>1x1</source>
- <translation type="obsolete">1x1</translation>
+ <location line="-5"/>
+ <source>Constant Bitrate</source>
+ <translation>固定位元率(CBR)</translation>
 </message>
 <message>
- <source>3x3</source>
- <translation type="obsolete">3x3</translation>
+ <location line="+1"/>
+ <source>Constant Quantiser</source>
+ <translation>恆定量化器(QP模式)</translation>
 </message>
 <message>
- <source>5x5</source>
- <translation type="obsolete">5x5</translation>
+ <location line="+2"/>
+ <source>Constant Rate Factor</source>
+ <translation>恆定速率係數(CRF)</translation>
 </message>
 <message>
- <source>7x7</source>
- <translation type="obsolete">7x7</translation>
+ <location line="+105"/>
+ <source>Target video size (MB)</source>
+ <translation>目標影片大小 (MB)</translation>
 </message>
 <message>
- <source>9x9</source>
- <translation type="obsolete">9x9</translation>
+ <location line="-5"/>
+ <location line="+19"/>
+ <source>Quantizer</source>
+ <translation>量化器</translation>
 </message>
 <message>
- <source>11x11</source>
- <translation type="obsolete">11x11</translation>
+ <location line="-115"/>
+ <source>Encoding mode</source>
+ <translation>編碼模式</translation>
 </message>
 <message>
- <source>15x15</source>
- <translation type="obsolete">15x15</translation>
+ <location line="+5"/>
+ <source>Bitrate</source>
+ <translation>位元率</translation>
 </message>
 <message>
- <source>21x21</source>
- <translation type="obsolete">21x21</translation>
+ <location line="-8"/>
+ <source>Two Pass - Video Size</source>
+ <translation>通 - 影片大小</translation>
 </message>
 <message>
- <source>Brush _Mode:</source>
- <translation type="obsolete">筆刷模式(_M):</translation>
+ <location line="+109"/>
+ <source>Average bitrate (kb/s)</source>
+ <translation>平均位元率(ABR)(kb/s)</translation>
 </message>
 <message>
- <source>Brush _Size:</source>
- <translation type="obsolete">筆刷大小(_S):</translation>
+ <location line="-15"/>
+ <source>Target bitrate (kb/s)</source>
+ <translation>目標位元率 (kb/s)</translation>
 </message>
+</context>
+<context>
+ <name>black</name>
 <message>
- <source>Output &quot;_Color&quot; for all masked pixels:</source>
- <translation type="obsolete">對所有被遮罩的像素輸出 &quot;顏色&quot; (_C):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
+ <source>Black</source>
+ <translation>1.4-設定影片為黑幕</translation>
 </message>
 <message>
- <source>Eraser _Data File:</source>
- <translation type="obsolete">擦除器資料檔(_D):</translation>
+ <location line="+14"/>
+ <source>_End time:</source>
+ <translation>_結束時間:</translation>
 </message>
 <message>
- <source>Select data file</source>
- <translation type="obsolete">選擇資料檔</translation>
+ <location line="+3"/>
+ <source>Replace by Black</source>
+ <translation>取代黑色</translation>
 </message>
 <message>
- <source>_Debugging settings (bits):</source>
- <translation type="obsolete">除錯設定(bits)(_D):</translation>
+ <location line="-16"/>
+ <source>Replace a section by black.</source>
+ <translation>設定影片某一段時間為黑幕</translation>
 </message>
 <message>
- <source>Eraser Configuration</source>
- <translation type="obsolete">擦除器設定</translation>
+ <location line="+12"/>
+ <source>_Start time:</source>
+ <translation>_開始時間:</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoFlux</name>
- <message>
- <source>_Temporal threshold:</source>
- <translation type="obsolete">時間臨界值(_T):</translation>
- </message>
+ <name>blacken</name>
 <message>
- <source>_Spatial threshold:</source>
- <translation type="obsolete">空間臨界值(_S):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+ <source>Blacken Borders</source>
+ <translation>1.3-加入內邊框填黑-框厚度不限</translation>
 </message>
 <message>
- <source>FluxSmooth</source>
- <translation type="obsolete">融熔平滑</translation>
+ <location line="+1"/>
+ <source>Remove noisy edge by turning them to black.</source>
+ <translation>刪除雜訊邊緣再塗黑，在總圖片大小內塗黑邊框，因此不影響圖片大小</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoForcedPP</name>
+ <name>blackenDialog</name>
 <message>
- <source>_Filter strength:</source>
- <translation type="obsolete">濾鏡強度(_F):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+59"/>
+ <source>Top:</source>
+ <translation>頂邊</translation>
 </message>
 <message>
- <source>_Quantizer:</source>
- <translation type="obsolete">量化值(_Q):</translation>
+ <location line="+71"/>
+ <source>Left:</source>
+ <translation>左邊</translation>
 </message>
 <message>
- <source>_Horizontal deblocking</source>
- <translation type="obsolete">去除水平方向塊狀色斑(_H)</translation>
+ <location line="-28"/>
+ <source>Reset</source>
+ <translation>重設</translation>
 </message>
 <message>
- <source>_Vertical deblocking</source>
- <translation type="obsolete">去除垂直方向塊狀色斑(_V)</translation>
+ <location line="-88"/>
+ <source>Blacken Borders</source>
+ <translation>1.3-加入內邊框填黑-框厚度不限</translation>
 </message>
 <message>
- <source>_Deringing</source>
- <translation type="obsolete">去除環狀色斑(_D)</translation>
+ <location line="+38"/>
+ <source>Right:</source>
+ <translation>右邊</translation>
 </message>
 <message>
- <source>Forced Postprocessing</source>
- <translation type="obsolete">強制性後置處理</translation>
+ <location line="+71"/>
+ <source>Bottom:</source>
+ <translation>下邊</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoKernelDeint</name>
- <message>
- <source>Top</source>
- <translation type="obsolete">頂部</translation>
- </message>
- <message>
- <source>Bottom</source>
- <translation type="obsolete">底部</translation>
- </message>
+ <name>blackframes</name>
 <message>
- <source>_Field order:</source>
- <translation type="obsolete">圖場優先次序(_F):</translation>
+ <location filename="../../common/gui_blackframes.cpp" line="+105"/>
+ <source>BlackFrame</source>
+ <translation>黑幀</translation>
 </message>
 <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
+ <location line="+22"/>
+ <source>Searching black frame..</source>
+ <translation>搜尋黑幀</translation>
 </message>
 <message>
- <source>Smaller means more deinterlacing</source>
- <translation type="obsolete">越小表示更多的去交錯</translation>
+ <location line="-22"/>
+ <source>This function is unsupported at the moment</source>
+ <translation>此函數不受支援的那一刻</translation>
 </message>
+</context>
+<context>
+ <name>changeFps</name>
 <message>
- <source>_Sharp</source>
- <translation type="obsolete">銳利(_S)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+238"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <source>_Sharper engine:</source>
- <translation type="obsolete">清晰化引擎(_S):</translation>
+ <location line="-195"/>
+ <source>29.97 (NTSC)</source>
+ <translation>29.97 (NTSC)</translation>
 </message>
 <message>
- <source>T_woway</source>
- <translation type="obsolete">雙向(_W)</translation>
+ <location line="+1"/>
+ <source>50 (Pal)</source>
+ <translation>50 (Pal)</translation>
 </message>
 <message>
- <source>Extrapolate better (better not to use it)</source>
- <translation type="obsolete">推算較好的 (最好不使用它)</translation>
+ <location line="-3"/>
+ <source>25 (PAL)</source>
+ <translation>25 (PAL)</translation>
 </message>
 <message>
- <source>_Map</source>
- <translation type="obsolete">對應(_M)</translation>
+ <location line="+197"/>
+ <source>Invalid fps</source>
+ <translation>無效FPS(幀數/秒)</translation>
 </message>
 <message>
- <source>Show interlaced areas (for test!)</source>
- <translation type="obsolete">顯示交錯的範圍(測試用！)</translation>
+ <location line="-198"/>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <source>KernelDeint</source>
- <translation type="obsolete">KernelDeint</translation>
+ <location line="+37"/>
+ <source>Change FPS</source>
+ <translation>1.0-改變幀速度</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoLargeMedian</name>
 <message>
- <source>_Process luma</source>
- <translation type="obsolete">處理明度(_P)</translation>
+ <location line="+156"/>
+ <source>Change fps</source>
+ <translation>改變FPS(幀數/秒)</translation>
 </message>
 <message>
- <source>Process luma plane</source>
- <translation type="obsolete">處理明度平面</translation>
+ <location line="-13"/>
+ <source>Source frame rate:</source>
+ <translation>源頭幀播放速率 :</translation>
 </message>
 <message>
- <source>P_rocess chroma</source>
- <translation type="obsolete">處理色度(_R)</translation>
+ <location line="+5"/>
+ <source>Destination frame rate:</source>
+ <translation>目的地幀播放速率 :</translation>
 </message>
 <message>
- <source>Large Median 5x5</source>
- <translation type="obsolete">巨大中位數 5x5</translation>
+ <location line="-183"/>
+ <source>23.976 (Film)</source>
+ <translation>23.976 (Film)</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoLavPPDeint</name>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location line="+177"/>
+ <source>Source Fps:</source>
+ <translation>源頭 Fps :</translation>
 </message>
 <message>
- <source>Linear blend</source>
- <translation type="obsolete">線性混合</translation>
+ <location line="-174"/>
+ <source>59.93 (NTSC)</source>
+ <translation>59.93 (NTSC)</translation>
 </message>
 <message>
- <source>Linear interpolate</source>
- <translation type="obsolete">線性插值</translation>
+ <location line="+33"/>
+ <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
+ <translation>影片快慢改變fps(幀/秒)的速度，這濾鏡可以改變時間</translation>
 </message>
 <message>
- <source>Cubic interpolate</source>
- <translation type="obsolete">立方插值</translation>
+ <location line="+146"/>
+ <source>Destination Fps:</source>
+ <translation>目的地 Fps:</translation>
 </message>
+</context>
+<context>
+ <name>chromashift</name>
 <message>
- <source>Median interpolate</source>
- <translation type="obsolete">中位插值</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+35"/>
+ <source>ChromaShift</source>
+ <translation>3.5-色度位移</translation>
 </message>
 <message>
- <source>FFmpeg deint</source>
- <translation type="obsolete">FFmpeg deint</translation>
+ <location line="+1"/>
+ <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
+ <translation>改變色度 U/V 來修復糟糕的明度/色度同步。</translation>
 </message>
+</context>
+<context>
+ <name>chromashiftDialog</name>
 <message>
- <source>_Deinterlacing:</source>
- <translation type="obsolete">去交錯(_D):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
+ <source>ChromaShift</source>
+ <translation>3.5-色度位移</translation>
 </message>
 <message>
- <source>_Autolevel</source>
- <translation type="obsolete">自動色階(_A)</translation>
+ <location line="+24"/>
+ <source>U Shift</source>
+ <translation>U 位移</translation>
 </message>
 <message>
- <source>libavcodec deinterlacer</source>
- <translation type="obsolete">libavcodec 去交錯器</translation>
+ <location line="+23"/>
+ <source>V Shift</source>
+ <translation>V 位移</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoLogo</name>
+ <name>coloryuv</name>
 <message>
- <source>_Logo (jpg file):</source>
- <translation type="obsolete">圖標(_L)(jpg 檔):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+115"/>
+ <source>U</source>
+ <translation>U</translation>
 </message>
 <message>
- <source>Select JPEG file</source>
- <translation type="obsolete">選擇 JPEG 檔案</translation>
+ <location line="+1"/>
+ <source>V</source>
+ <translation>V</translation>
 </message>
 <message>
- <source>_X Position:</source>
- <translation type="obsolete">_X 位置:</translation>
+ <location line="-2"/>
+ <source>Y</source>
+ <translation>Y</translation>
 </message>
 <message>
- <source>_Y Position:</source>
- <translation type="obsolete">_Y 位置:</translation>
+ <location line="-36"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <source>_Alpha:</source>
- <translation type="obsolete">_Alpha:</translation>
+ <location line="+35"/>
+ <source>Flags</source>
+ <translation>旗標記</translation>
 </message>
 <message>
- <source>Logo</source>
- <translation type="obsolete">圖標</translation>
+ <location line="-31"/>
+ <source>Levels:</source>
+ <translation>等級</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoMPD3D</name>
 <message>
- <source>_Spatial luma strength:</source>
- <translation type="obsolete">空間的明度強度(_S):</translation>
+ <location line="-3"/>
+ <source>PC-&gt;TV</source>
+ <translation>PC-&gt;TV</translation>
 </message>
 <message>
- <source>S_patial chroma strength:</source>
- <translation type="obsolete">空間的色度強度(_P):</translation>
+ <location line="-16"/>
+ <source>Color management filter.</source>
+ <translation>顏色管理濾鏡器</translation>
 </message>
 <message>
- <source>_Temporal strength:</source>
- <translation type="obsolete">時間強度(_T):</translation>
+ <location line="+34"/>
+ <source>U gain</source>
+ <translation>U 增益</translation>
 </message>
 <message>
- <source>MPlayer hqdn3d</source>
- <translation type="obsolete">MPlayer hqdn3d</translation>
+ <location line="+9"/>
+ <source>V gain</source>
+ <translation>V 增益</translation>
 </message>
 <message>
- <source>MPlayer denoise3d</source>
- <translation type="obsolete">MPlayer denoise3d</translation>
+ <location line="-26"/>
+ <source>TV-&gt;PC</source>
+ <translation>TV-&gt;PC</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoMPD3Dlow</name>
 <message>
- <source>_Spatial luma strength:</source>
- <translation type="obsolete">空間的明度強度(_S):</translation>
+ <location line="+9"/>
+ <source>Y gain</source>
+ <translation>Y 增益</translation>
 </message>
 <message>
- <source>S_patial chroma strength:</source>
- <translation type="obsolete">空間的色度強度(_P):</translation>
+ <location line="+30"/>
+ <source>colorYuv</source>
+ <translation>顏色Yuv</translation>
 </message>
 <message>
- <source>_Temporal strength:</source>
- <translation type="obsolete">時間強度(_T):</translation>
+ <location line="-10"/>
+ <source>V Contrast</source>
+ <translation>V 對比</translation>
 </message>
 <message>
- <source>MPlayer denoise3d</source>
- <translation type="obsolete">MPlayer denoise3d</translation>
+ <location line="-17"/>
+ <source>Y Contrast</source>
+ <translation>Y 對比</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoMaskedSoften</name>
 <message>
- <source>_Luma threshold:</source>
- <translation type="obsolete">明度臨界值(_L):</translation>
+ <location line="+8"/>
+ <source>U Contrast</source>
+ <translation>U 對比</translation>
 </message>
 <message>
- <source>C_hroma threshold:</source>
- <translation type="obsolete">色度臨界值(_H):</translation>
+ <location line="-10"/>
+ <source>Y Brightness</source>
+ <translation>Y 亮度</translation>
 </message>
 <message>
- <source>_Radius:</source>
- <translation type="obsolete">半徑(_R):</translation>
+ <location line="+17"/>
+ <source>V Brightness</source>
+ <translation>V 亮度</translation>
 </message>
 <message>
- <source>Soften</source>
- <translation type="obsolete">柔化</translation>
+ <location line="-9"/>
+ <source>U Brightness</source>
+ <translation>U 亮度</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoMosaic</name>
 <message>
- <source>_Horizontal stacking:</source>
- <translation type="obsolete">水平層疊(_H):</translation>
+ <location line="-21"/>
+ <source>Clip to Tv Range (16-235)</source>
+ <translation>剪輯電視系列 (16-235)</translation>
 </message>
 <message>
- <source>_Vertical stacking:</source>
- <translation type="obsolete">垂直層疊(_V):</translation>
+ <location line="+14"/>
+ <source>Y Gamma</source>
+ <translation>Y 伽馬射線</translation>
 </message>
 <message>
- <source>_Shrink factor:</source>
- <translation type="obsolete">收縮係數(_S):</translation>
+ <location line="-16"/>
+ <source>AutoWhite</source>
+ <translation>自動白</translation>
 </message>
 <message>
- <source>Show _frame</source>
- <translation type="obsolete">顯示畫格(_F)</translation>
+ <location line="+1"/>
+ <source>AutoGain</source>
+ <translation>自動增益</translation>
 </message>
 <message>
- <source>Mosaic</source>
- <translation type="obsolete">馬賽克</translation>
+ <location line="-14"/>
+ <source>Avisynth color filter.</source>
+ <translation>3.3-Avisynth顏色濾鏡器</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoPalShift</name>
- <message>
- <source>_Try reverse</source>
- <translation type="obsolete">嘗試反轉(_T)</translation>
- </message>
+ <name>contrast</name>
 <message>
- <source>Pal Field Shift</source>
- <translation type="obsolete">Pal 場移動</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+35"/>
+ <source>Adjust contrast, brightness and colors.</source>
+ <translation>調整對比、亮度和色彩。</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoParticle</name>
 <message>
- <source>New format, preferred, good for Tracker3D</source>
- <translation type="obsolete">新格式，對 Tracker3D 來說是首選</translation>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
+ <location line="+90"/>
+ <source>Contrast</source>
+ <translation>3.2-對比</translation>
 </message>
 <message>
- <source>DG@UWA format (includes shape info &amp; bounding box)</source>
- <translation type="obsolete">DG@UWA 格式 (包含形狀資訊 &amp; 範圍邊界)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-89"/>
+ <location line="+90"/>
+ <source>Brightness</source>
+ <translation>亮度</translation>
 </message>
+</context>
+<context>
+ <name>contrastDialog</name>
 <message>
- <source>AB@ODU format (includes shape info)</source>
- <translation type="obsolete">AB@ODU 格式 (包含形狀資訊)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui" line="+127"/>
+ <source>Luma</source>
+ <translation>明度</translation>
 </message>
 <message>
- <source>Old format that Tracker3D can&apos;t read directly</source>
- <translation type="obsolete">舊格式無法正確讀取 Tracker3D</translation>
+ <location line="-113"/>
+ <location line="+19"/>
+ <source>Contrast</source>
+ <translation>對比</translation>
 </message>
 <message>
- <source>Output _Format:</source>
- <translation type="obsolete">輸出格式(_F):</translation>
+ <location line="+101"/>
+ <source>Process</source>
+ <translation>程序</translation>
 </message>
 <message>
- <source>Mi_nimum area for a particle to be detected:</source>
- <translation type="obsolete">偵測一個區段的最小範圍(_N):</translation>
+ <location line="+22"/>
+ <source>MPEG2-&gt;PC</source>
+ <translation>MPEG2-&gt;PC</translation>
 </message>
 <message>
- <source>Ma_ximum area for a particle to be detected:</source>
- <translation type="obsolete">偵測一個區段的最大範圍(_X):</translation>
+ <location line="-43"/>
+ <source>ChromaU</source>
+ <translation>色度U</translation>
 </message>
 <message>
- <source>_Left side crop (ignore particles in):</source>
- <translation type="obsolete">剪裁左側 (忽略在區段中的)(_L):</translation>
+ <location line="+7"/>
+ <source>ChromaV</source>
+ <translation>色度V</translation>
 </message>
 <message>
- <source>_Right side crop (ignore particles in):</source>
- <translation type="obsolete">剪裁右側 (忽略在區段中的)(_R):</translation>
+ <location line="-94"/>
+ <source>Contrast </source>
+ <translation>對比 </translation>
 </message>
 <message>
- <source>_Top crop (ignore particles in):</source>
- <translation type="obsolete">剪裁頂部 (忽略在區段中的)(_T):</translation>
+ <location line="+48"/>
+ <source>Brightness</source>
+ <translation>亮度</translation>
 </message>
 <message>
- <source>_Bottom crop (ignore particles in):</source>
- <translation type="obsolete">剪裁底部 (忽略在區段中的)(_B):</translation>
+ <location line="-7"/>
+ <source>Brightness </source>
+ <translation>亮度 </translation>
 </message>
+</context>
+<context>
+ <name>convolution</name>
 <message>
- <source>_Output File:</source>
- <translation type="obsolete">輸出檔案(_O):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+141"/>
+ <source>Fast Convolution</source>
+ <translation>快速卷積</translation>
 </message>
 <message>
- <source>Select file</source>
- <translation type="obsolete">選擇檔案</translation>
+ <location line="-5"/>
+ <source>Process luma plane</source>
+ <translation>處理明度平面</translation>
 </message>
 <message>
- <source>_Camera number:</source>
- <translation type="obsolete">攝影機數目(_C):</translation>
+ <location line="+0"/>
+ <source>_Process luma</source>
+ <translation>_處理明度</translation>
 </message>
 <message>
- <source>_Debugging settings (bits):</source>
- <translation type="obsolete">除錯設定(_D)(位元):</translation>
+ <location line="+1"/>
+ <source>P_rocess chroma</source>
+ <translation>處_理色度</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoResampleFPS</name>
+ <name>crash</name>
 <message>
- <source>_New frame rate:</source>
- <translation type="obsolete">新畫格率(_N):</translation>
+ <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
+ <source>Load it</source>
+ <translation>載入它</translation>
 </message>
 <message>
- <source>_Blend</source>
- <translation type="obsolete">混合(_B)</translation>
+ <location line="+0"/>
+ <source>Crash file</source>
+ <translation>損壞檔</translation>
 </message>
 <message>
- <source>Resample fps</source>
- <translation type="obsolete">重複取樣 fps</translation>
+ <location line="+1"/>
+ <source>I have detected a crash file. 
+Do you want to load it ?
+(It will be deleted in all cases, you should save it if you want to keep it)</source>
+ <translation>偵測到一個損壞檔。
+是否要載入 ?
+(在所有的案例都會偵測，若要保存它你必須執行儲存)</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoRotate</name>
- <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
- </message>
- <message>
- <source>90 degrees</source>
- <translation type="obsolete">90 度</translation>
- </message>
- <message>
- <source>90Â°</source>
- <translation type="obsolete">90Â°</translation>
- </message>
- <message>
- <source>180 degrees</source>
- <translation type="obsolete">180 度</translation>
- </message>
+ <name>crop</name>
 <message>
- <source>180Â°</source>
- <translation type="obsolete">180Â°</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+ <source>Crop</source>
+ <translation>1.2-裁剪影片邊框尺寸</translation>
 </message>
 <message>
- <source>270 degrees</source>
- <translation type="obsolete">270 度</translation>
+ <location line="+1"/>
+ <source>Crop filter</source>
+ <translation>裁剪濾鏡</translation>
 </message>
 <message>
- <source>270Â°</source>
- <translation type="obsolete">270Â°</translation>
+ <location line="+23"/>
+ <source>Warning Cropping too much width ! Width reseted !
+</source>
+ <translation>重定的寬度！裁剪太多寬度的警告！</translation>
 </message>
 <message>
- <source>_Angle:</source>
- <translation type="obsolete">角度(_A):</translation>
+ <location line="+5"/>
+ <source>Warning Cropping too much height ! Height reseted !
+</source>
+ <translation>重定的寬度！裁剪太多寬度的警告！</translation>
 </message>
 <message>
- <source>Rotate</source>
- <translation type="obsolete">旋轉</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+324"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
- <name>ADMVideoStabilize</name>
+ <name>cropDialog</name>
 <message>
- <source>Stabilize Threshold</source>
- <translation type="obsolete">穩定臨界值</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
+ <source>Crop</source>
+ <translation>裁剪</translation>
 </message>
 <message>
- <source>Stabilize</source>
- <translation type="obsolete">穩定</translation>
+ <location line="+45"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+68"/>
+ <source>Top:</source>
+ <translation>頂部:</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoSubASS</name>
 <message>
- <source>_Subtitle file (ASS/SSA):</source>
- <translation type="obsolete">字幕檔(A_SS/SSA):</translation>
+ <location line="+71"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <source>Left:</source>
+ <translation>左:</translation>
 </message>
 <message>
- <source>Select Subtitle file</source>
- <translation type="obsolete">選擇字幕檔</translation>
+ <location line="-28"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
+ <source>Reset</source>
+ <translation>重設</translation>
 </message>
 <message>
- <source>_Line spacing:</source>
- <translation type="obsolete">行距(_L):</translation>
+ <location line="-50"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Right:</source>
+ <translation>右:</translation>
 </message>
 <message>
- <source>_Font scale:</source>
- <translation type="obsolete">字體縮放(_F):</translation>
+ <location line="+71"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+ <source>Bottom:</source>
+ <translation>底部:</translation>
 </message>
 <message>
- <source>_Top margin:</source>
- <translation type="obsolete">頂部邊界(_T):</translation>
+ <location line="+37"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
+ <source>Auto Crop</source>
+ <translation>自動剪裁</translation>
 </message>
 <message>
- <source>Botto_m margin</source>
- <translation type="obsolete">底部邊界(_M)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+37"/>
+ <source>Size: </source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>ASS</source>
- <translation type="obsolete">ASS</translation>
+ <location line="+26"/>
+ <source>&amp;Hide Rubber Band</source>
+ <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
- <name>ADMVideoSubtitle</name>
+ <name>dcaenc</name>
 <message>
- <source>Could not open subtitle file</source>
- <translation type="obsolete">無法開啟字幕檔</translation>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
+ <source>_Bitrate:</source>
+ <translation>_位元率:</translation>
 </message>
 <message>
- <source>Cannot identify subtitle format</source>
- <translation type="obsolete">無法識別字幕格式</translation>
+ <location line="+6"/>
+ <source>DcaEnc Configuration</source>
+ <translation>DcaEnc 配置</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoSwissArmyKnife</name>
- <message>
- <source>P&apos; = A</source>
- <translation type="obsolete">P&apos; = A</translation>
- </message>
- <message>
- <source>P&apos; = P</source>
- <translation type="obsolete">P&apos; = P</translation>
- </message>
- <message>
- <source>P&apos; = P - A</source>
- <translation type="obsolete">P&apos; = P - A</translation>
- </message>
+ <name>decimate</name>
 <message>
- <source>P&apos; = A - P</source>
- <translation type="obsolete">P&apos; = A - P</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+92"/>
+ <source>Sho_w</source>
+ <translation>慢_慢</translation>
 </message>
 <message>
- <source>P&apos; = P + A</source>
- <translation type="obsolete">P&apos; = P + A</translation>
+ <location line="-17"/>
+ <source>Replace (interpolate)</source>
+ <translation>取代 (插入)</translation>
 </message>
 <message>
- <source>P&apos; = P * A</source>
- <translation type="obsolete">P&apos; = P * A</translation>
+ <location line="-18"/>
+ <source>Donald Graft decimate. Remove duplicate after telecide.</source>
+ <translation>唐納德(Donald Graft)抽取，在 telecide 後刪除重複。</translation>
 </message>
 <message>
- <source>P&apos; = P / A</source>
- <translation type="obsolete">P&apos; = P / A</translation>
+ <location line="-1"/>
+ <source>Decomb decimate</source>
+ <translation>2.5-迪刊謀 迪賽袂(Decomb Decimate)-抽幀去梳理反向PAL影片</translation>
 </message>
 <message>
- <source>P&apos; = A / P</source>
- <translation type="obsolete">P&apos; = A / P</translation>
+ <location line="+39"/>
+ <source>Decomb Decimate</source>
+ <translation>2.5-迪刊謀 迪賽袂(Decomb Decimate)-抽幀去梳理反向PAL影片</translation>
 </message>
 <message>
- <source>P&apos; = min (P, A)</source>
- <translation type="obsolete">P&apos; = 最小 (P, A)</translation>
+ <location line="-13"/>
+ <source>Medium (full luma, no chroma)</source>
+ <translation>中 (全部的明度，沒有色度)</translation>
 </message>
 <message>
- <source>P&apos; = max (P, A)</source>
- <translation type="obsolete">P&apos; = 最大 (P, A)</translation>
+ <location line="-6"/>
+ <source>Discard longer dupe (animés)</source>
+ <translation>丟棄更長的蒙蔽 (animés)</translation>
 </message>
 <message>
- <source>A = convolve(P); Load convolution kernel from file</source>
- <translation type="obsolete">A = 卷積(P); 從檔案載入卷積內核</translation>
+ <location line="+14"/>
+ <source>T_hreshold 2:</source>
+ <translation>界_限值 2:</translation>
 </message>
 <message>
- <source>A = pixel from image file as float; Load image from file</source>
- <translation type="obsolete">A = 圖像檔的像素作為浮動的; 從檔案載入圖像</translation>
+ <location line="-16"/>
+ <source>Discard closer</source>
+ <translation>丟棄較靠近的</translation>
 </message>
 <message>
- <source>A = pixel from image file as integer; Load image from file</source>
- <translation type="obsolete">A = 圖像檔的像素作為整數; 從檔案載入圖像</translation>
+ <location line="+13"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
 </message>
 <message>
- <source>A = floating point constant value</source>
- <translation type="obsolete">A = 浮動點固定值</translation>
+ <location line="-7"/>
+ <source>Fastest (no chroma, partial luma)</source>
+ <translation>最快 (沒有色度，部份的明度)</translation>
 </message>
 <message>
- <source>A = rolling average of pixel: A = A*(1-alpha)+(P*alpha)</source>
- <translation type="obsolete">A = 像素的可變動範圍: A = A*(1-alpha)+(P*alpha)</translation>
+ <location line="+11"/>
+ <source>C_ycle:</source>
+ <translation>循_環:</translation>
 </message>
 <message>
- <source>Select _Operation on each pixel P and input A:</source>
- <translation type="obsolete">選擇在每個像素 P 的操作和輸入 A(_O):</translation>
+ <location line="-3"/>
+ <source>_Quality:</source>
+ <translation>_品質:</translation>
 </message>
 <message>
- <source>Input _Type:</source>
- <translation type="obsolete">輸入類型(_T):</translation>
+ <location line="+1"/>
+ <source>_Threshold 1:</source>
+ <translation>_界限值 1:</translation>
 </message>
 <message>
- <source>Input _File (image or convolution kernel):</source>
- <translation type="obsolete">輸入檔 (圖像或卷積內核)(_F):</translation>
+ <location line="-12"/>
+ <source>Pulldown dupe removal</source>
+ <translation>去除往下拉蒙蔽</translation>
 </message>
+</context>
+<context>
+ <name>delogo2</name>
 <message>
- <source>Select file</source>
- <translation type="obsolete">選擇檔案</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+41"/>
+ <source>MPlayer delogo2</source>
+ <translation>5.1-去標誌2(MPlayer delogo2)</translation>
 </message>
 <message>
- <source>_Load Bias (added to each pixel
-in file image when loaded):</source>
- <translation type="obsolete">載入偏向(當載入時
-在檔案映像增加至每個像素)(_L):</translation>
+ <location line="+1"/>
+ <source>Blend a logo by interpolating its surrounding box.</source>
+ <translation>利用插值它的包圍框來混合一個標誌。</translation>
 </message>
+</context>
+<context>
+ <name>dgbob</name>
 <message>
- <source>Load _Multiplier (each pixel in
-file image mult. by this when loaded):</source>
- <translation type="obsolete">載入乘法器 (當載入時
-在檔案圖像的每像素靠這個倍增)(_M):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
+ <source>Top</source>
+ <translation>頂部</translation>
 </message>
 <message>
- <source>Input _Constant:</source>
- <translation type="obsolete">輸入固定值(_C):</translation>
+ <location line="+15"/>
+ <source>DGBob</source>
+ <translation>2.5-浮標濾鏡器(DGBob)-浮標效果</translation>
 </message>
 <message>
- <source>Memory constant _alpha
-(where A = (1-alpha)*A + alpha*(curr_frame + lookahead)):</source>
- <translation type="obsolete">記憶體固定 _alpha 的分母
-(這裡 A = (1-alpha)*A + alpha*(目前畫格+預先看見的)):</translation>
+ <location line="-27"/>
+ <source>dgbob</source>
+ <translation>2.5-浮標濾鏡器(DGBob)-浮標效果</translation>
 </message>
 <message>
- <source>Look ahead _N frames:</source>
- <translation type="obsolete">預見的 _N 畫格:</translation>
+ <location line="+21"/>
+ <source>_Top Field First:</source>
+ <translation>_頂部首先掃描</translation>
 </message>
 <message>
- <source>Init _Start Frame (first frame # to use for head start):</source>
- <translation type="obsolete">初始化起始畫格 (第一個畫格 # 使用在開端)(_S):</translation>
+ <location line="-4"/>
+ <source>Double nb of frames and fps</source>
+ <translation>兩倍幀和 fps 的數目</translation>
 </message>
 <message>
- <source>Init _End Frame (last frame # to use for head start):</source>
- <translation type="obsolete">初始化結束畫格 (最後畫格 # 使用在開端)(_E):</translation>
+ <location line="-4"/>
+ <source>Bottom</source>
+ <translation>底部</translation>
 </message>
 <message>
- <source>Init By _Rolling (compute head start using a rolling average rather than a straight average)</source>
- <translation type="obsolete">依據變動初始化(計算開端使用一個波動平均數更精確於直接平均數)(_R)</translation>
+ <location line="+11"/>
+ <source>Extra check, avoid using it</source>
+ <translation>額外檢查，避免正在使用它</translation>
 </message>
 <message>
- <source>_Bias (will be added to result):</source>
- <translation type="obsolete">偏向 (將會加到結果)(_B):</translation>
+ <location line="-6"/>
+ <source>Double nb of frames (slow motion)</source>
+ <translation>兩倍幀的數量(慢運動)</translation>
 </message>
 <message>
- <source>_Result Bias (added to each result pixel):</source>
- <translation type="obsolete">產生偏向 (將會加到結果)(_R):</translation>
+ <location line="+6"/>
+ <source>_Extra</source>
+ <translation>_額外</translation>
 </message>
 <message>
- <source>Result _Multiplier (each result pixel
-multiplied by this):</source>
- <translation type="obsolete">乘法器 (當載入時
-在檔案圖像的每像素靠這個倍增)(_M):</translation>
+ <location line="-2"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
 </message>
 <message>
- <source>_Histogram every N frames (0 to disable):</source>
- <translation type="obsolete">每 N 個畫格的分佈圖 (0 為停用)(_H):</translation>
+ <location line="-6"/>
+ <source>Keep nb of frames and fps</source>
+ <translation>維持幀和 fps 的數目</translation>
 </message>
 <message>
- <source>_Debugging settings (bits):</source>
- <translation type="obsolete">除錯設定 (bits)(_D):</translation>
+ <location line="+7"/>
+ <source>_Threshold:</source>
+ <translation>_界限值:</translation>
 </message>
 <message>
- <source>Swiss Army Knife Configuration</source>
- <translation type="obsolete">瑞士軍刀設定</translation>
+ <location line="-22"/>
+ <source>Donald Graft Bob.</source>
+ <translation>唐納德(Donald Graft)Bob.</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoTIsophote</name>
- <message>
- <source>Medium</source>
- <translation type="obsolete">中</translation>
- </message>
+ <name>dummy</name>
 <message>
- <source>_Type:</source>
- <translation type="obsolete">類型(_T):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp" line="+44"/>
+ <source>Dummy</source>
+ <translation>8.1-虛擬</translation>
 </message>
 <message>
- <source>Smaller means more deinterlacing</source>
- <translation type="obsolete">越小表示更多的去交錯</translation>
+ <location line="+1"/>
+ <source>Null filter, it does nothing at all.</source>
+ <translation>空的濾鏡器，它沒有所有。</translation>
 </message>
+</context>
+<context>
+ <name>dv</name>
 <message>
- <source>KernelDeint</source>
- <translation type="obsolete">KernelDeint</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
+ <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+ <translation>DV 僅支援 720 * 576 * 25 幀/秒和 720 * 480 * 29.97 幀/秒</translation>
 </message>
 </context>
 <context>
- <name>ADMVideoThreshold</name>
+ <name>encodingDialog</name>
 <message>
- <source>Mi_nimum value to be in-range:</source>
- <translation type="obsolete">在範圍中的最小值(_N):</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+398"/>
+ <location line="+31"/>
+ <location line="+48"/>
+ <source>0</source>
+ <translation>0</translation>
 </message>
 <message>
- <source>Ma_ximum value to be in-range:</source>
- <translation type="obsolete">在範圍中的最大值(_X):</translation>
+ <location line="-331"/>
+ <source>Low</source>
+ <translation>低</translation>
 </message>
 <message>
- <source>In-range values go white, out-of-range go black</source>
- <translation type="obsolete">數值在範圍內會變白，在範圍外會變黑</translation>
+ <location line="+187"/>
+ <location line="+7"/>
+ <location line="+14"/>
+ <source>0 MB</source>
+ <translation>0 MB</translation>
 </message>
 <message>
- <source>In-range values go black, out-of-range go white</source>
- <translation type="obsolete">數值在範圍內會變黑，在範圍外會變白</translation>
+ <location line="-228"/>
+ <source>High</source>
+ <translation>高</translation>
 </message>
 <message>
- <source>Output values:</source>
- <translation type="obsolete">輸出值:</translation>
+ <location line="-84"/>
+ <source>Main</source>
+ <translation>主要</translation>
 </message>
 <message>
- <source>_Debugging settings (bits):</source>
- <translation type="obsolete">除錯設定(位元)(_D):</translation>
+ <location line="+28"/>
+ <location line="+180"/>
+ <location line="+21"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <source>Threshold Configuration</source>
- <translation type="obsolete">臨界值設定</translation>
+ <location line="-14"/>
+ <source>Audio Codec:</source>
+ <translation>音訊編解碼器:</translation>
 </message>
-</context>
-<context>
- <name>ADMVideoYadif</name>
 <message>
- <source>Temporal &amp; spatial check</source>
- <translation type="obsolete">時間 &amp; 空間檢查</translation>
+ <location line="-142"/>
+ <source>Priority:</source>
+ <translation>優先權:</translation>
 </message>
 <message>
- <source>Bob, temporal &amp; spatial check</source>
- <translation type="obsolete">上下來回，時間 &amp; 空間檢查</translation>
+ <location line="+232"/>
+ <source>Video Size:</source>
+ <translation>影片大小:</translation>
 </message>
 <message>
- <source>Skip spatial temporal check</source>
- <translation type="obsolete">略過空間時間檢查</translation>
+ <location line="-28"/>
+ <source>Audio Size:</source>
+ <translation>音訊大小:</translation>
 </message>
 <message>
- <source>Bob, skip spatial temporal check</source>
- <translation type="obsolete">上下來回，略過空間時間檢查</translation>
+ <location line="-188"/>
+ <source>Above Normal</source>
+ <translation>高於一般</translation>
 </message>
 <message>
- <source>Bottom field first</source>
- <translation type="obsolete">底部圖場先</translation>
+ <location line="+154"/>
+ <source>Video Codec:</source>
+ <translation>影片編解碼器:</translation>
 </message>
 <message>
- <source>Top field first</source>
- <translation type="obsolete">底部圖場先</translation>
+ <location line="-144"/>
+ <source>Below Normal</source>
+ <translation>低於一般</translation>
 </message>
 <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
+ <location line="+322"/>
+ <source>Elapsed:</source>
+ <translation>經過時間:</translation>
 </message>
 <message>
- <source>_Order:</source>
- <translation type="obsolete">命令(_O):</translation>
+ <location line="-41"/>
+ <source>0 kB/s</source>
+ <translation>0 kB/s</translation>
 </message>
 <message>
- <source>yadif</source>
- <translation type="obsolete">yadif</translation>
+ <location line="+48"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
 </message>
-</context>
-<context>
- <name>ADM_AudiocodecWMA</name>
 <message>
- <source>Internal error</source>
- <translation type="obsolete">內部錯誤</translation>
+ <location line="-386"/>
+ <source>Time Remaining:</source>
+ <translation>剩餘時間:</translation>
 </message>
 <message>
- <source>Cannot open WMA2 codec.</source>
- <translation type="obsolete">無法開啟 WMA2 編解碼器。</translation>
+ <location line="+52"/>
+ <source>Normal</source>
+ <translation>一般</translation>
 </message>
-</context>
-<context>
- <name>ADM_Composer</name>
 <message>
- <source>No video loaded</source>
- <translation type="obsolete">沒有載入視訊</translation>
+ <location line="-59"/>
+ <source>Phase:</source>
+ <translation>階段:</translation>
 </message>
 <message>
- <source>Not indexable</source>
- <translation type="obsolete">非可索引的</translation>
+ <location line="+338"/>
+ <source>Quantiser:</source>
+ <translation>量化器:</translation>
 </message>
 <message>
- <source>DivX 5 + packed?</source>
- <translation type="obsolete">DivX 5 + 打包?</translation>
+ <location line="-320"/>
+ <source>Shut down computer when finished</source>
+ <translation>完成後關閉電腦</translation>
 </message>
 <message>
- <source>Rebuilding Frames</source>
- <translation type="obsolete">重建畫格</translation>
+ <location line="+96"/>
+ <source>Pause / Abort</source>
+ <translation>暫停 / 停止</translation>
 </message>
 <message>
- <source>Aborted</source>
- <translation type="obsolete">已中止</translation>
+ <location line="+200"/>
+ <source>Average Bitrate:</source>
+ <translation>平均位元率(ABR):</translation>
 </message>
 <message>
- <source>Unsupported</source>
- <translation type="obsolete">未支援的</translation>
+ <location line="-113"/>
+ <source>Container:</source>
+ <translation>容器:</translation>
 </message>
 <message>
- <source>Old format project file</source>
- <translation type="obsolete">舊格式的專案檔案</translation>
+ <location line="-252"/>
+ <source>Encoding...</source>
+ <translation>正在編碼...</translation>
 </message>
 <message>
- <source>No more supported.</source>
- <translation type="obsolete">不再支援。</translation>
+ <location line="+145"/>
+ <source>Minimize to Tray</source>
+ <translation>縮到工具列上</translation>
 </message>
 <message>
- <source>File type identified but no loader support detected...</source>
- <translation type="obsolete">識別出檔案類型但沒有偵測到支援的載入器...</translation>
+ <location line="+33"/>
+ <source>Advanced</source>
+ <translation>進階</translation>
 </message>
 <message>
- <source>May be related to an old index file.</source>
- <translation type="obsolete">可能被關聯至一個舊的索引檔。</translation>
+ <location line="+204"/>
+ <source>Processed Frames:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
- <source>Attempt to open %s failed!</source>
- <translation type="unfinished">嘗試開啟 %s 失敗!</translation>
+ <location line="+76"/>
+ <source>Frames/sec:</source>
+ <translation>幀/秒:</translation>
 </message>
 <message>
- <source>Video dimensions don&apos;t match.</source>
- <translation type="obsolete">視訊尺寸不符合。</translation>
+ <location line="-431"/>
+ <location line="+211"/>
+ <source>Unknown</source>
+ <translation>未知</translation>
 </message>
 <message>
- <source>You cannot mix different video dimensions yet. Using the partial video filter later will not work around this problem. The workaround is:
-
-1) &quot;Resize&quot; / &quot;Add Border&quot; / &quot;Crop&quot; each stream to the same resolution
-2) Concatenate them together</source>
- <translation type="obsolete">你還不能摻入不同的視訊大小。 隨後使用的區段性視訊濾鏡將會失效。 工作區為:
-
-1) &quot;調整大小&quot; / &quot;增加邊框&quot; / &quot;剪裁&quot; 每個串流對應相同的解析度
-2) 一起連結它們</translation>
+ <location line="+62"/>
+ <source>Total Size:</source>
+ <translation>總大小:</translation>
 </message>
+</context>
+<context>
+ <name>eq2</name>
 <message>
- <source>Build Time Map</source>
- <translation type="obsolete">建立時間對應</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+52"/>
+ <source>Reset</source>
+ <translation>重新設定</translation>
 </message>
 <message>
- <source>Build VBR time map?</source>
- <translation type="obsolete">建立 VBR 時間對應?</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+65"/>
+ <source>Adjust contrast, brightness, saturation and gamma.</source>
+ <translation>調整對比、亮度、飽和度和伽馬射線。</translation>
 </message>
 <message>
- <source>Use safe mode</source>
- <translation type="obsolete">使用安全模式</translation>
+ <location line="-1"/>
+ <source>MPlayer eq2</source>
+ <translation>3.2-綜合均衡器MPlayer eq2</translation>
 </message>
+</context>
+<context>
+ <name>eq2Dialog</name>
 <message>
- <source>H.264 detected</source>
- <translation type="obsolete">偵測到 H.264</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+201"/>
+ <source>Red</source>
+ <translation>紅</translation>
 </message>
 <message>
- <source>If the file is using B-frames as reference it can lead to a crash or stuttering.
-Avidemux can use another mode which is safe but YOU WILL LOSE FRAME ACCURACY.
-Do you want to use that mode?</source>
- <translation type="obsolete">假如這個檔案使用 B-畫格為參考，那麼會導致不正常關閉或影片斷斷續續。
-Avidemux 能使用其他的方式來儲存，但是&lt;b&gt;你將失去畫格的精確度&lt;/b&gt;。
-你要使用這個方式嗎 ?</translation>
+ <location line="-7"/>
+ <source>Blue</source>
+ <translation>藍</translation>
 </message>
 <message>
- <source>Packed Bitstream detected</source>
- <translation type="obsolete">偵測到打包好的位元流</translation>
+ <location line="+38"/>
+ <source>Green</source>
+ <translation>綠</translation>
 </message>
 <message>
- <source>Do you want me to unpack it ?</source>
- <translation type="obsolete">要將它拆開打包嗎?</translation>
+ <location line="-24"/>
+ <source>Initial</source>
+ <translation>初始</translation>
 </message>
 <message>
- <source>Could not unpack the video</source>
- <translation type="obsolete">無法拆開打包此視訊</translation>
+ <location line="+7"/>
+ <source>Weight</source>
+ <translation>加重</translation>
 </message>
 <message>
- <source>Using backup decoder - not frame accurate.</source>
- <translation type="obsolete">使用備份解碼器 - 非正確的畫格。</translation>
+ <location line="-201"/>
+ <location line="+88"/>
+ <source>Contrast</source>
+ <translation>對比</translation>
 </message>
 <message>
- <source>Weird</source>
- <translation type="obsolete">奇特的</translation>
+ <location line="-51"/>
+ <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
+ <translation>&lt;b&gt;珈碼&lt;/b&gt;</translation>
 </message>
 <message>
- <source>The unpacking succeedeed but the index is still not up to date.</source>
- <translation type="obsolete">拆開打包成功但索引仍然不是最新的。</translation>
+ <location line="+37"/>
+ <source>Saturation</source>
+ <translation>飽和度</translation>
 </message>
 <message>
- <source>Index is not up to date</source>
- <translation type="obsolete">索引不是最新的</translation>
+ <location line="+7"/>
+ <source>Brightness</source>
+ <translation>亮度</translation>
 </message>
+</context>
+<context>
+ <name>faac</name>
 <message>
- <source>You should use Tool-&gt;Rebuild frame. Do it now ?</source>
- <translation type="obsolete">您應該使用 工具-&gt;重新建立畫格。要現在執行嗎?</translation>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
+ <source>_Bitrate:</source>
+ <translation>_位元率:</translation>
 </message>
 <message>
- <source>This looks like mpeg
- Do you want to index it?</source>
- <translation type="obsolete">這個檔案像是 mpeg
- 要索引它嗎?</translation>
+ <location line="+6"/>
+ <source>Faac Configuration</source>
+ <translation>Faac 配置</translation>
 </message>
 <message>
- <source>Indexing failed</source>
- <translation type="obsolete">索引失敗</translation>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
+ <source>Opus Configuration</source>
+ <translation type="unfinished"></translation>
 </message>
+</context>
+<context>
+ <name>fadeTo</name>
 <message>
- <location line="-36"/>
- <source>Cannot find a demuxer for %s</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+ <location line="+23"/>
+ <source>Fade</source>
+ <translation>1.4-淡化效果</translation>
 </message>
 <message>
- <location line="+62"/>
- <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
-1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
-2.) concatenate them together</source>
- <translation type="unfinished"></translation>
+ <location line="-22"/>
+ <source>Fade.</source>
+ <translation>淡化某一段時間效果</translation>
 </message>
 <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
- <source>Checking if timestamps are valid..</source>
- <translation type="unfinished"></translation>
+ <location line="+19"/>
+ <source>_End time:</source>
+ <translation>_結束時間:</translation>
 </message>
 <message>
- <location line="+18"/>
- <source>Some timing information are incorrect.
-It happens with some capture software.
-If you re encode video we should drop these informations,
- else it will cause dropped frame/jerky video.
-If you just copy the video without reencoding,
- you should keep them.
-Drop timing informations ?</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>_Start time:</source>
+ <translation>_開始時間:</translation>
 </message>
 </context>
 <context>
- <name>ADM_Qt4CoreUIToolkit</name>
+ <name>fadeToBlack</name>
 <message>
- <source>Alert</source>
- <translation type="obsolete">警告</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+67"/>
+ <source>In</source>
+ <translation>淡入</translation>
 </message>
 <message>
- <source>Info</source>
- <translation type="obsolete">資訊</translation>
+ <location line="+0"/>
+ <source>Out</source>
+ <translation>淡出</translation>
 </message>
 <message>
- <source>Confirmation</source>
- <translation type="obsolete">答覆</translation>
+ <location line="+9"/>
+ <source>_Start time:</source>
+ <translation type="unfinished">_開始時間:</translation>
 </message>
 <message>
- <source>Question</source>
- <translation type="obsolete">問題</translation>
+ <location line="+1"/>
+ <source>_End time:</source>
+ <translation type="unfinished">_結束時間:</translation>
 </message>
-</context>
-<context>
- <name>ADM_Qt4Factory::ADM_Qbitrate</name>
 <message>
- <source>Constant Bitrate</source>
- <translation type="obsolete">固定位元率</translation>
+ <location line="-2"/>
+ <source>_Fade type:</source>
+ <translation>_淡化型式:</translation>
 </message>
 <message>
- <source>Constant Quantiser</source>
- <translation type="obsolete">固定量化值</translation>
+ <location line="-8"/>
+ <source>Fade out</source>
+ <translation>淡出</translation>
 </message>
 <message>
- <source>Same Quantiser as Input</source>
- <translation type="obsolete">量化值與輸入來源相同</translation>
+ <location line="+0"/>
+ <source>Fade in</source>
+ <translation>淡入</translation>
 </message>
 <message>
- <source>Constant Rate Factor</source>
- <translation type="obsolete">固定數比率係數</translation>
+ <location line="-11"/>
+ <location line="+24"/>
+ <source>Fade to black</source>
+ <translation>1.4-由淡到黑(淡入/淡出)</translation>
 </message>
 <message>
- <source>Two Pass - Video Size</source>
- <translation type="obsolete">二次運算 - 視訊大小</translation>
+ <location line="-23"/>
+ <source>Fade to black in/out.</source>
+ <translation>由淡到黑 淡入/淡出-某一段時間效果。</translation>
 </message>
+</context>
+<context>
+ <name>ffmpeg2</name>
 <message>
- <source>Two Pass - Average Bitrate</source>
- <translation type="obsolete">二次運算 - 平均位元率</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+237"/>
+ <source>Three threads</source>
+ <translation>三個線程</translation>
 </message>
 <message>
- <source>Encoding mode</source>
- <translation type="obsolete">編碼模式</translation>
+ <location line="-11"/>
+ <source>KVCD</source>
+ <translation>KVCD</translation>
 </message>
 <message>
- <source>Bitrate</source>
- <translation type="obsolete">位元率</translation>
+ <location line="+38"/>
+ <source>_Trellis quantization</source>
+ <translation>_網格量化</translation>
 </message>
 <message>
- <source>Target bitrate (kb/s)</source>
- <translation type="obsolete">目標位元率 (kb/s)</translation>
+ <location line="-4"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大量化器的_區別：</translation>
 </message>
 <message>
- <source>Target video size (MB)</source>
- <translation type="obsolete">目標視訊大小 (MB)</translation>
+ <location line="+1"/>
+ <source>VBV Buffer Size:</source>
+ <translation>VBV 緩衝容量 :</translation>
 </message>
 <message>
- <source>Average bitrate (kb/s)</source>
- <translation type="obsolete">平均位元率 (kb/s)</translation>
+ <location line="-29"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
 </message>
 <message>
- <source>-</source>
- <translation type="obsolete">-</translation>
+ <location line="+41"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_容許誤差檔案大小 (kb): </translation>
 </message>
-</context>
-<context>
- <name>ADM_Qt4Factory::ADM_QconfigMenu</name>
 <message>
- <source>Configuration:</source>
- <translation type="obsolete">設定:</translation>
+ <location line="+8"/>
+ <source>Field Order:</source>
+ <translation>掃描場順序:</translation>
 </message>
 <message>
- <source>Save As</source>
- <translation type="obsolete">另存新檔</translation>
+ <location line="-5"/>
+ <source>Quantizer _blur:</source>
+ <translation> 量化器_模糊：</translation>
 </message>
 <message>
- <source>Delete</source>
- <translation type="obsolete">刪除</translation>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop(圖像群組)大小：</translation>
 </message>
 <message>
- <source>&lt;default&gt;</source>
- <translation type="obsolete">&lt;預設&gt;</translation>
+ <location line="-40"/>
+ <source>Auto (#cpu)</source>
+ <translation>自動 (#cpu)</translation>
 </message>
 <message>
- <source>&lt;custom&gt;</source>
- <translation type="obsolete">&lt;自訂&gt;</translation>
+ <location line="-20"/>
+ <source>Wide (16:9)</source>
+ <translation>寬 (16:9)</translation>
 </message>
 <message>
- <source>Are you sure you wish to delete the selected configuration?</source>
- <translation type="obsolete">確定要刪除所選的設定嗎?</translation>
+ <location line="+28"/>
+ <source>Top Field First</source>
+ <translation>頂部首先掃描</translation>
 </message>
 <message>
- <source>Configuration File (*.xml)</source>
- <translation type="obsolete">設定檔 (*.xml)</translation>
+ <location line="+39"/>
+ <source>Basic Settings</source>
+ <translation>基本設定</translation>
 </message>
-</context>
-<context>
- <name>ADM_QthreadCount</name>
 <message>
- <source>Disabled</source>
- <translation type="obsolete">停用</translation>
+ <location line="-60"/>
+ <source>Animes</source>
+ <translation>動畫</translation>
 </message>
 <message>
- <source>Auto-detect</source>
- <translation type="obsolete">自動偵測</translation>
+ <location line="+33"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
 </message>
 <message>
- <source>Custom</source>
- <translation type="obsolete">自訂</translation>
+ <location line="+40"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
 </message>
-</context>
-<context>
- <name>ADM_ogmWrite</name>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location line="-36"/>
+ <source>Max bitrate (kb/s):</source>
+ <translation>最大位元率 (kb/s):</translation>
 </message>
 <message>
- <source>Copy</source>
- <translation type="obsolete">複製</translation>
+ <location line="+44"/>
+ <source>libavcodec MPEG-2 configuration</source>
+ <translation>libavcodec MPEG-2 配置</translation>
 </message>
 <message>
- <source>File error</source>
- <translation type="obsolete">檔案錯誤</translation>
+ <location line="-71"/>
+ <source>One thread</source>
+ <translation>一個線程</translation>
 </message>
 <message>
- <source>Cannot open &quot;%s&quot; for writing.</source>
- <translation type="obsolete">無法開啟 &quot;%s&quot; 進行寫入。</translation>
+ <location line="-5"/>
+ <source>MB comparison</source>
+ <translation>MB 比較</translation>
 </message>
 <message>
- <source>OGM</source>
- <translation type="obsolete">OGM</translation>
+ <location line="+12"/>
+ <source>Progressive</source>
+ <translation>漸進的</translation>
 </message>
 <message>
- <source>Could not initialize video</source>
- <translation type="obsolete">無法初始化視訊</translation>
+ <location line="+15"/>
+ <source>Threading</source>
+ <translation>線程</translation>
 </message>
 <message>
- <source>Could not initialize audio</source>
- <translation type="obsolete">無法初始化音訊</translation>
+ <location line="+9"/>
+ <source>_Number of B frames:</source>
+ <translation> _B 幀的數量:</translation>
 </message>
-</context>
-<context>
- <name>ADM_ogmWriteCopy</name>
 <message>
- <source>Copy</source>
- <translation type="obsolete">複製</translation>
+ <location line="+27"/>
+ <source>Interlacing</source>
+ <translation>交錯</translation>
 </message>
 <message>
- <source>Saving...</source>
- <translation type="obsolete">正在儲存...</translation>
+ <location line="-57"/>
+ <source>Two threads)</source>
+ <translation>兩個線程</translation>
 </message>
-</context>
-<context>
- <name>ADM_ogmWriteProcess</name>
 <message>
- <source>Filter init failed</source>
- <translation type="obsolete">濾鏡初始化失敗</translation>
+ <location line="-13"/>
+ <source>Default</source>
+ <translation>預設</translation>
 </message>
 <message>
- <source>Pass one</source>
- <translation type="obsolete">運算 1</translation>
+ <location line="+66"/>
+ <source>Adv. Settings</source>
+ <translation>Adv. 設定</translation>
 </message>
 <message>
- <source>Pass 2</source>
- <translation type="obsolete">運算 2</translation>
+ <location line="-65"/>
+ <source>Tmpgenc</source>
+ <translation>Tmpgenc</translation>
 </message>
 <message>
- <source>Encoding</source>
- <translation type="obsolete">正在編碼</translation>
+ <location line="-7"/>
+ <source>Normal (4:3)</source>
+ <translation>正常 (4:3)</translation>
 </message>
 <message>
- <source>Reuse the existing log file?</source>
- <translation type="obsolete">重複使用現有的日誌檔?</translation>
+ <location line="+55"/>
+ <source>Matrices:</source>
+ <translation>矩陣:</translation>
 </message>
-</context>
-<context>
- <name>ADM_qt4Factory::ADM_QthreadCount</name>
 <message>
- <source>Disabled</source>
- <translation type="obsolete">停用</translation>
+ <location line="-2"/>
+ <source>_Macroblock decision:</source>
+ <translation>_宏塊決定:</translation>
 </message>
 <message>
- <source>Auto-detect</source>
- <translation type="obsolete">自動偵測</translation>
+ <location line="-27"/>
+ <source>Interlaced</source>
+ <translation>交錯</translation>
 </message>
 <message>
- <source>Custom</source>
- <translation type="obsolete">自訂</translation>
+ <location line="+4"/>
+ <source>Bottom Field First</source>
+ <translation>底部首先掃描</translation>
 </message>
-</context>
-<context>
- <name>ADM_qtray</name>
 <message>
- <source>Open Avidemux</source>
- <translation type="obsolete">開啟 Avidemux</translation>
+ <location line="+56"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
 </message>
-</context>
-<context>
- <name>AVDMFastVideoConvolution</name>
 <message>
- <source>_Process luma</source>
- <translation type="obsolete">處理明度(_P)</translation>
+ <location line="-44"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器:</translation>
 </message>
 <message>
- <source>Process luma plane</source>
- <translation type="obsolete">處理明度平面</translation>
+ <location line="-28"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少位元 (vhq)</translation>
 </message>
 <message>
- <source>P_rocess chroma</source>
- <translation type="obsolete">處理色度(_R)</translation>
+ <location line="+40"/>
+ <source>Aspect ratio:</source>
+ <translation>像素比例(PAR):</translation>
 </message>
 <message>
- <source>Fast Convolution</source>
- <translation type="obsolete">快速卷積</translation>
+ <location line="+9"/>
+ <source>_Interlaced:</source>
+ <translation>_交錯：</translation>
 </message>
-</context>
-<context>
- <name>AVDMGenericAudioStream</name>
 <message>
- <source>Building VBR map</source>
- <translation type="obsolete">正在建立 VBR 對應</translation>
+ <location line="-5"/>
+ <source>_Quantizer compression:</source>
+ <translation>_量化器壓縮：</translation>
 </message>
 </context>
 <context>
- <name>AVDMVideoAddBorder</name>
- <message>
- <source>_Left border:</source>
- <translation type="obsolete">左側邊界(_L):</translation>
- </message>
+ <name>ffmpeg4</name>
 <message>
- <source>_Right border:</source>
- <translation type="obsolete">右側邊界(_R):</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+208"/>
+ <source>Three threads</source>
+ <translation>三個線程</translation>
 </message>
 <message>
- <source>_Top border:</source>
- <translation type="obsolete">頂部邊界(_T):</translation>
+ <location line="-16"/>
+ <source>X1</source>
+ <translation>X1</translation>
 </message>
 <message>
- <source>_Bottom border:</source>
- <translation type="obsolete">底部邊界(_B):</translation>
+ <location line="-3"/>
+ <source>Log</source>
+ <translation>Log</translation>
 </message>
 <message>
- <source>Add Borders</source>
- <translation type="obsolete">加入邊框</translation>
+ <location line="+36"/>
+ <source>4_MV</source>
+ <translation>4_MV</translation>
 </message>
 <message>
- <source>Incorrect parameters</source>
- <translation type="obsolete">不正確的參數</translation>
+ <location line="-34"/>
+ <source>EPZS</source>
+ <translation>EPZS</translation>
 </message>
 <message>
- <source>All parameters must be even and within range.</source>
- <translation type="obsolete">所有參數必須是偶數且在範圍內。</translation>
+ <location line="-3"/>
+ <source>Full</source>
+ <translation>全部</translation>
 </message>
-</context>
-<context>
- <name>AVDMVideoMCDeint</name>
 <message>
- <source>Fast</source>
- <translation type="obsolete">快</translation>
+ <location line="+9"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
 </message>
 <message>
- <source>Medium</source>
- <translation type="obsolete">中</translation>
+ <location line="-10"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <source>Slow iterative motion search</source>
- <translation type="obsolete">緩慢反覆的動作搜尋</translation>
+ <location line="+42"/>
+ <source>_GMC</source>
+ <translation>_GMC</translation>
 </message>
 <message>
- <source>Extra slow (same as 3+multiple reference frames)</source>
- <translation type="obsolete">特別慢 (同於3或3倍數以上的參考畫格數)</translation>
+ <location line="-3"/>
+ <source>_Trellis quantization</source>
+ <translation>_格子量化</translation>
 </message>
 <message>
- <source>Top</source>
- <translation type="obsolete">頂部</translation>
+ <location line="-30"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
 </message>
 <message>
- <source>Bottom</source>
- <translation type="obsolete">底部</translation>
+ <location line="-6"/>
+ <source>Phods</source>
+ <translation>Phods</translation>
 </message>
 <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
+ <location line="+33"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大量化器的_區別:</translation>
 </message>
 <message>
- <source>_Field dominance:</source>
- <translation type="obsolete">圖場控制(_F):</translation>
+ <location line="-20"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
 </message>
 <message>
- <source>_Qp:</source>
- <translation type="obsolete">_Qp:</translation>
+ <location line="+34"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_濾鏡大小容許誤差</translation>
 </message>
 <message>
- <source>mcDeinterlace</source>
- <translation type="obsolete">mcDeinterlace</translation>
+ <location line="+3"/>
+ <source>Quantizer _blur:</source>
+ <translation>量化器_模糊：</translation>
 </message>
-</context>
-<context>
- <name>AVDMVideoStreamBSMear</name>
 <message>
- <source>_Left border:</source>
- <translation type="obsolete">左側邊界(_L):</translation>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop 大小:</translation>
 </message>
 <message>
- <source>_Right border:</source>
- <translation type="obsolete">右側邊界(_R):</translation>
+ <location line="-33"/>
+ <source>Auto (#cpu)</source>
+ <translation>自動 (#cpu)</translation>
 </message>
 <message>
- <source>_Top border:</source>
- <translation type="obsolete">頂部邊界(_T):</translation>
+ <location line="+36"/>
+ <source>User Interface</source>
+ <translation>使用者介面</translation>
 </message>
 <message>
- <source>_Bottom border:</source>
- <translation type="obsolete">底部邊界(_B):</translation>
+ <location line="-24"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
 </message>
 <message>
- <source>Blacken Borders</source>
- <translation type="obsolete">邊框填黑</translation>
+ <location line="+12"/>
+ <source>_Quantization type:</source>
+ <translation>_量化型式</translation>
 </message>
 <message>
- <source>Incorrect parameters</source>
- <translation type="obsolete">不正確的參數</translation>
+ <location line="+26"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
 </message>
 <message>
- <source>All parameters must be even and within range.</source>
- <translation type="obsolete">所有參數必須是偶數且在範圍內。</translation>
+ <location line="+8"/>
+ <source>libavcodec MPEG-4 configuration</source>
+ <translation>libavcodec MPEG-4 配置</translation>
 </message>
-</context>
-<context>
- <name>AVDMVideoVlad</name>
 <message>
- <source>_Luma temporal threshold:</source>
- <translation type="obsolete">明度時間臨界值(_L):</translation>
+ <location line="-61"/>
+ <source>One thread</source>
+ <translation>一個線程</translation>
 </message>
 <message>
- <source>Ch_roma temporal threshold:</source>
- <translation type="obsolete">色度時間臨界值(_R):</translation>
+ <location line="-5"/>
+ <source>MB comparison</source>
+ <translation>MB 比較</translation>
 </message>
 <message>
- <source>Temporal Cleaner</source>
- <translation type="obsolete">時間清理器</translation>
+ <location line="+19"/>
+ <source>Threading</source>
+ <translation>線程</translation>
 </message>
-</context>
-<context>
- <name>AVDM_Fade</name>
 <message>
- <source>Out</source>
- <translation type="obsolete">出</translation>
+ <location line="-1"/>
+ <source>Matrices</source>
+ <translation>矩陣</translation>
 </message>
 <message>
- <source>Fade out</source>
- <translation type="obsolete">淡出</translation>
+ <location line="+13"/>
+ <source>_Number of B frames:</source>
+ <translation>_B幀的數量</translation>
 </message>
 <message>
- <source>In</source>
- <translation type="obsolete">入</translation>
+ <location line="-25"/>
+ <source>Two threads)</source>
+ <translation>兩個線程</translation>
 </message>
 <message>
- <source>Fade in</source>
- <translation type="obsolete">淡入</translation>
+ <location line="+48"/>
+ <source>Motion Estimation</source>
+ <translation>運動估計</translation>
 </message>
 <message>
- <source>_Fade type:</source>
- <translation type="obsolete">淡化方式(_F):</translation>
+ <location line="-7"/>
+ <source>Advanced Simple Profile</source>
+ <translation>進階簡單設定檔</translation>
 </message>
 <message>
- <source>_Start frame:</source>
- <translation type="obsolete">起始畫格(_S):</translation>
+ <location line="-13"/>
+ <source>_Macroblock decision:</source>
+ <translation>_宏塊決定</translation>
 </message>
 <message>
- <source>_End frame:</source>
- <translation type="obsolete">結束畫格(_E):</translation>
+ <location line="-7"/>
+ <source>_Quarter pixel</source>
+ <translation>_1/4像素</translation>
 </message>
 <message>
- <source>Fade to _black</source>
- <translation type="obsolete">逐漸消失成黑色(_B)</translation>
+ <location line="+36"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
 </message>
 <message>
- <source>Fade</source>
- <translation type="obsolete">淡化</translation>
+ <location line="-42"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器:</translation>
 </message>
 <message>
- <source>Parameter Error</source>
- <translation type="obsolete">參數錯誤</translation>
+ <location line="-20"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少位元 (vhq)</translation>
 </message>
 <message>
- <source>Start must be before end, and both within video # of frames.</source>
- <translation type="obsolete">在結束前必須開始，並且兩者在畫格的視訊 # 之內。</translation>
+ <location line="+37"/>
+ <source>_Quantizer compression:</source>
+ <translation>_濾鏡氣壓縮</translation>
 </message>
 </context>
 <context>
- <name>CalculatorDialog</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+16"/>
- <source>Calculator</source>
- <translation type="unfinished">計算機</translation>
- </message>
+ <name>ffmsmpeg4</name>
 <message>
- <location line="+12"/>
- <source>Target</source>
- <translation type="unfinished">目標</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+229"/>
+ <source>X1</source>
+ <translation>X1</translation>
 </message>
 <message>
- <location line="+28"/>
- <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
+ <location line="-3"/>
+ <source>Log</source>
+ <translation>Log</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>AVI</source>
- <translation type="unfinished">AVI</translation>
+ <location line="+2"/>
+ <source>EPZS</source>
+ <translation>EPZS</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>OGM</source>
- <translation type="unfinished">OGM</translation>
+ <location line="-3"/>
+ <source>Full</source>
+ <translation>全部</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+9"/>
 <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Medium:</source>
- <translation type="unfinished">媒體:</translation>
+ <translation>MPEG</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Format:</source>
- <translation type="unfinished">格式:</translation>
+ <location line="-10"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Duration:</source>
- <translation type="unfinished">持續時間:</translation>
+ <location line="+28"/>
+ <source>_Trellis quantization</source>
+ <translation>_網格量化</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>1 x 80 minute CD</source>
- <translation type="unfinished">1 x 80 分鐘 CD</translation>
+ <location line="-19"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>2 x 80 minute CD</source>
- <translation type="unfinished">2 x 80 分鐘 CD</translation>
+ <location line="-6"/>
+ <source>Phods</source>
+ <translation>Phods</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>1 x 74 minute CD</source>
- <translation type="unfinished">1 x 74 分鐘 CD</translation>
+ <location line="+24"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大量化器的_區別</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>2 x 74 minute CD</source>
- <translation type="unfinished">2 x 74 分鐘 CD</translation>
+ <location line="-11"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>DVD-5</source>
- <translation type="unfinished">DVD-5</translation>
+ <location line="+13"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_容許誤差檔案大小 (kb):</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Custom</source>
- <translation type="unfinished">自訂</translation>
+ <location line="+3"/>
+ <source>Quantizer _blur:</source>
+ <translation>量化_模糊：</translation>
 </message>
 <message>
- <location line="+58"/>
- <source>Custom Size:</source>
- <translation type="unfinished">自訂大小:</translation>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop(圖像群組) 大小:</translation>
 </message>
 <message>
- <location line="+23"/>
- <location line="+198"/>
- <location line="+27"/>
- <location line="+34"/>
- <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <location line="+3"/>
+ <source>User Interface</source>
+ <translation>使用者介面</translation>
 </message>
 <message>
- <location line="-217"/>
- <source>Audio Bitrate</source>
- <translation type="unfinished">音訊位元率</translation>
+ <location line="-12"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Track 1:</source>
- <translation type="unfinished">軌道 1:</translation>
+ <location line="+17"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+37"/>
- <location line="+232"/>
- <source>kbps</source>
- <translation type="unfinished">kbps</translation>
+ <location line="+8"/>
+ <source>libavcodec MPEG-4 configuration</source>
+ <translation>libavcodec MPEG-4 配置</translation>
 </message>
 <message>
- <location line="-246"/>
- <source>Track 2:</source>
- <translation type="unfinished">軌道 2:</translation>
+ <location line="-36"/>
+ <source>MB comparison</source>
+ <translation>MB 比較</translation>
 </message>
 <message>
- <location line="+39"/>
- <source>Result</source>
- <translation type="unfinished">結果</translation>
+ <location line="+33"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
 </message>
 <message>
- <location line="+28"/>
- <source>Audio Size:</source>
- <translation type="unfinished">音訊大小:</translation>
+ <location line="-21"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Video Size:</source>
- <translation type="unfinished">視訊大小:</translation>
+ <location line="-11"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少位元 (vhq)</translation>
 </message>
 <message>
- <location line="+15"/>
- <location line="+27"/>
- <location line="+34"/>
- <location line="+68"/>
- <location line="+18"/>
- <source>0</source>
- <translation type="unfinished">0</translation>
+ <location line="+16"/>
+ <source>_Quantizer compression:</source>
+ <translation>_量化器壓縮:</translation>
 </message>
+</context>
+<context>
+ <name>ffnvenc</name>
 <message>
- <location line="-101"/>
- <source>Total Size:</source>
- <translation type="unfinished">總大小:</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+221"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+196"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+222"/>
+ <source>Low Latency</source>
+ <translation>低延遲</translation>
 </message>
 <message>
- <location line="+120"/>
- <source>Bits Per Pixel:</source>
- <translation type="unfinished">每像素位元數:</translation>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-1"/>
+ <source>BluRay</source>
+ <translation>BluRay藍光</translation>
 </message>
 <message>
 <location line="+7"/>
- <source>Video Bitrate:</source>
- <translation type="unfinished">視訊位元率:</translation>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+61"/>
- <source>OK</source>
+ <location line="+1"/>
+ <source>Main</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Cancel</source>
+ <location line="+1"/>
+ <source>High</source>
 <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>Cnr2Dialog</name>
 <message>
- <source>Chroma Noise Reducer 2</source>
- <translation type="obsolete">色度雜訊去除器 2</translation>
+ <location line="+8"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Scene Change</source>
- <translation type="obsolete">場景改變</translation>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+11"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+11"/>
+ <source>Bitrate (kbps):</source>
+ <translation>位元率 (kbps):</translation>
 </message>
 <message>
- <source>0%</source>
- <translation type="obsolete">0%</translation>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation>位元率 (kbps):</translation>
 </message>
 <message>
- <source>Scene Change Threshold</source>
- <translation type="obsolete">場景改變臨界值</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
+ <source>libavcodec MPEG-4 configuration</source>
+ <translation>libavcodec MPEG-4配置</translation>
 </message>
 <message>
- <source>100%</source>
- <translation type="obsolete">100%</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="-3"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-2"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-6"/>
+ <source>Preset:</source>
+ <translation>預設定</translation>
 </message>
 <message>
- <source>Use chroma to also detect scene change</source>
- <translation type="obsolete">也使用色度偵測場景改變</translation>
+ <location line="+4"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Settings</source>
- <translation type="obsolete">設定</translation>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Wide</source>
- <translation type="obsolete">廣泛</translation>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Narrow</source>
- <translation type="obsolete">狹道</translation>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Mode</source>
- <translation type="obsolete">模式</translation>
+ <location line="+9"/>
+ <source>NVENC H.264 configuration</source>
+ <translation>NVENC H.264 配置</translation>
 </message>
 <message>
- <source>Luma Y:</source>
- <translation type="obsolete">明度 Y:</translation>
+ <location line="-34"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-12"/>
+ <source>Low Quality</source>
+ <translation>低品質</translation>
 </message>
 <message>
- <source>Chroma V:</source>
- <translation type="obsolete">色度 V:</translation>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+ <source>High Quality</source>
+ <translation>高品質</translation>
 </message>
 <message>
- <source>Maximum</source>
- <translation type="obsolete">最大值</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+17"/>
+ <source>nvEnc HEVC configuration</source>
+ <translation>nvEnc HEVC 配置</translation>
 </message>
 <message>
- <source>Chroma U:</source>
- <translation type="obsolete">色度 U:</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+4"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-13"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
+ <source>Low Latency (HQ)</source>
+ <translation>低延遲 (HQ)</translation>
 </message>
 <message>
- <source>Sensibility</source>
- <translation type="obsolete">靈敏度</translation>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-1"/>
+ <source>Low Latency (LQ)</source>
+ <translation>低延遲 (LQ)</translation>
 </message>
 </context>
 <context>
- <name>ColorYuvDialog</name>
- <message>
- <source>Avisynth ColorYUV</source>
- <translation type="obsolete">Avisynth ColorYUV</translation>
- </message>
+ <name>ffpsmuxer</name>
 <message>
- <source>Colour Correction Matrix</source>
- <translation type="obsolete">色彩校正矩陣</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+ <source>Free</source>
+ <translation>自由</translation>
 </message>
 <message>
- <source>Contrast</source>
- <translation type="obsolete">對比</translation>
+ <location line="+2"/>
+ <source>Muxing Format</source>
+ <translation>複合器格式</translation>
 </message>
 <message>
- <source>Chroma U:</source>
- <translation type="obsolete">色度 U:</translation>
+ <location line="+18"/>
+ <source>Mpeg PS Muxer</source>
+ <translation>Mpeg PS 複合器</translation>
 </message>
 <message>
- <source>Chroma V:</source>
- <translation type="obsolete">色度 V:</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+187"/>
+ <source> video not compatible
+</source>
+ <translation>影片不相容</translation>
 </message>
 <message>
- <source>Luma Y:</source>
- <translation type="obsolete">明度 Y:</translation>
+ <location line="+38"/>
+ <source> VCD : only MP2 audio accepted
+</source>
+ <translation>VCD : 僅 MP2 音訊被接受</translation>
 </message>
 <message>
- <source>Brightness</source>
- <translation type="obsolete">亮度</translation>
+ <location line="-23"/>
+ <source> Bad width/height for SVCD
+</source>
+ <translation>不對的寬度/高度為 SVCD</translation>
 </message>
 <message>
- <source>Gain</source>
- <translation type="obsolete">增益</translation>
+ <location line="-60"/>
+ <source>Saving mpeg PS (ff)</source>
+ <translation>儲存mpeg PS (ff)</translation>
 </message>
 <message>
- <source>Gamma</source>
- <translation type="obsolete">伽馬</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="-17"/>
+ <source>Allow non compliant stream</source>
+ <translation>容許非相容的流</translation>
 </message>
 <message>
- <source>Note: all values are normalised to 256</source>
- <translation type="obsolete">注意: 所有超過的數值將被標準化為 256</translation>
+ <location line="+3"/>
+ <source>VBV size (kBytes)</source>
+ <translation>VBV 大小 (kBytes)</translation>
 </message>
 <message>
- <source>Parameters</source>
- <translation type="obsolete">參數</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+95"/>
+ <source> DVD : only 48 khz audio accepted
+</source>
+ <translation>DVD : 僅 48 khz 音訊被接受</translation>
 </message>
 <message>
- <source>Matrix:</source>
- <translation type="obsolete">矩陣:</translation>
+ <location line="+6"/>
+ <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
+</source>
+ <translation>[ffPS] DVD : 僅MP2/AC3/DTS 音訊被接受</translation>
 </message>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location line="-179"/>
+ <source>[Mismatch]</source>
+ <translation>[Mismatch]</translation>
 </message>
 <message>
- <source>TV -&gt; PC</source>
- <translation type="obsolete">TV 轉成 PC</translation>
+ <location line="+144"/>
+ <source> Bad width/height for DVD
+</source>
+ <translation>不對的寬度/高度為 DVD</translation>
 </message>
 <message>
- <source>PC -&gt; TV</source>
- <translation type="obsolete">PC 轉成 TV</translation>
+ <location line="-12"/>
+ <source> Bad width/height for VCD
+</source>
+ <translation>不對的寬度/高度為 VCD</translation>
 </message>
 <message>
- <source>PC -&gt; TV.Y</source>
- <translation type="obsolete">PC 轉成 TV.Y</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+1"/>
+ <source>Advanced</source>
+ <translation>進階</translation>
 </message>
 <message>
- <source>Level:</source>
- <translation type="obsolete">色階:</translation>
+ <location line="-2"/>
+ <source>Video Muxrate (kbits)</source>
+ <translation>影片複合率 (kbits)</translation>
 </message>
 <message>
- <source>Rec.709</source>
- <translation type="obsolete">Rec.709</translation>
+ <location line="-1"/>
+ <source>Total Muxrate (kbits)</source>
+ <translation>總複合率 (kbits)</translation>
 </message>
 <message>
- <source>Coring</source>
- <translation type="obsolete">正在去核</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+34"/>
+ <source> VCD : only 44.1 khz audio accepted
+</source>
+ <translation>VCD : 僅 44.1 khz 音訊被接受</translation>
 </message>
+</context>
+<context>
+ <name>fftsmuxer</name>
 <message>
- <source>Opt:</source>
- <translation type="obsolete">選擇:</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+34"/>
+ <source>TS Muxer</source>
+ <translation>TS 複合器</translation>
 </message>
 <message>
- <source>Auto Gain</source>
- <translation type="obsolete">自動增益</translation>
+ <location line="-5"/>
+ <source>Mux rate (MBits/s)</source>
+ <translation>複合率 (MBits/s)</translation>
 </message>
 <message>
- <source>Display Colour Statistics</source>
- <translation type="obsolete">顯示色彩狀態</translation>
+ <location line="-1"/>
+ <source>VBR muxing</source>
+ <translation>VBR 複合</translation>
 </message>
 <message>
- <source>Centre Colour Offsets</source>
- <translation type="obsolete">中心色彩偏移</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+ <source>Saving mpeg TS (ff)</source>
+ <translation>儲存 mpeg TS (ff)</translation>
 </message>
 </context>
 <context>
- <name>DGbob</name>
+ <name>ffvtenc</name>
 <message>
- <source>Top</source>
- <translation type="obsolete">頂部</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+ <source>Baseline</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Bottom</source>
- <translation type="obsolete">底部</translation>
+ <location line="+1"/>
+ <source>Main</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Keep nb of frames and fps</source>
- <translation type="obsolete">保持畫格和 fps 的數目</translation>
+ <location line="+1"/>
+ <source>High</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Double nb of frames and fps</source>
- <translation type="obsolete">兩倍畫格和 fps 的數目</translation>
+ <location line="+5"/>
+ <source>Profile:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Double nb of frames (slow motion)</source>
- <translation type="obsolete">兩倍畫格的數量(慢動作)</translation>
+ <location line="+1"/>
+ <source>GOP Size:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Field order:</source>
- <translation type="obsolete">圖場優先順序(_F):</translation>
+ <location line="+1"/>
+ <source>Maximum Consecutive B-Frames:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
+ <location line="+1"/>
+ <source>Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Extra</source>
- <translation type="obsolete">額外(_E)</translation>
+ <location line="+1"/>
+ <source>Rate Control</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Extra check, avoid using it</source>
- <translation type="obsolete">額外檢查，避免正在使用它</translation>
+ <location line="+1"/>
+ <source>Frame Control</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>DGBob</source>
- <translation type="obsolete">DGBob</translation>
+ <location line="+9"/>
+ <source>VideoToolbox H.264 Encoder Configuration</source>
+ <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
- <name>DIA_encodingQt4</name>
+ <name>filesel</name>
 <message>
- <source>Shutting down</source>
- <translation type="obsolete">正在關機</translation>
+ <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+215"/>
+ <source>Cannot write the file</source>
+ <translation>無法寫入檔案</translation>
 </message>
 <message>
- <source>The encoding is paused. Do you want to resume or abort?</source>
- <translation type="obsolete">編碼已經暫停。您要繼續或中止?</translation>
+ <location line="-52"/>
+ <source>%s already exists.
+
+Do you want to replace it?</source>
+ <translation>%s 已存在。
+
+你要取代它嗎?</translation>
 </message>
 <message>
- <source>Resume</source>
- <translation type="obsolete">繼續</translation>
+ <location line="-13"/>
+ <source>Cannot open &quot;%s&quot;.</source>
+ <translation>無法開啟 &quot;%s&quot;。</translation>
 </message>
 <message>
- <source>Abort</source>
- <translation type="obsolete">中止</translation>
+ <location line="+0"/>
+ <source>File error</source>
+ <translation>檔案錯誤</translation>
 </message>
 <message>
- <source>Privileges Required</source>
- <translation type="obsolete">需要特殊權限</translation>
+ <location line="+65"/>
+ <source>No write access to &quot;%s&quot;.</source>
+ <translation>沒有任何寫入運動存取到 &quot;%s&quot;。</translation>
 </message>
 <message>
- <source>Root privileges are required to perform this operation.</source>
- <translation type="obsolete">需要 Root 權限來實行這項操作。</translation>
+ <location line="-25"/>
+ <location line="+14"/>
+ <source>It is possible that you are trying to overwrite an input file!</source>
+ <translation>你可能嘗試覆寫一個輸入檔!</translation>
 </message>
 </context>
 <context>
- <name>DVEncoder</name>
+ <name>flux</name>
 <message>
- <source>Incompatible settings</source>
- <translation type="obsolete">不相容的設定</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
+ <source>Spatio-temporal cleaner by Ross Thomas.</source>
+ <translation>空間-時間清理器，作者為 Ross Thomas。</translation>
 </message>
-</context>
-<context>
- <name>Decimate</name>
 <message>
- <source>Discard closer</source>
- <translation type="obsolete">丟棄較靠近的</translation>
+ <location line="+50"/>
+ <source>_Temporal threshold:</source>
+ <translation>_時間界限值:</translation>
 </message>
 <message>
- <source>Replace (interpolate)</source>
- <translation type="obsolete">取代 (插入)</translation>
+ <location line="-51"/>
+ <location line="+56"/>
+ <source>FluxSmooth</source>
+ <translation>4.3-時空平滑(FluxSmooth)</translation>
 </message>
 <message>
- <source>Discard longer dupe (animÃ©s)</source>
- <translation type="obsolete">丟棄 longer dupe (animés)</translation>
+ <location line="-4"/>
+ <source>_Spatial threshold:</source>
+ <translation>_空間界限值:</translation>
 </message>
+</context>
+<context>
+ <name>flv1</name>
 <message>
- <source>Pulldown dupe removal</source>
- <translation type="obsolete">去除 Pulldown 偽裝</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+167"/>
+ <source>X1</source>
+ <translation>X1</translation>
 </message>
 <message>
- <source>Fastest (no chroma, partial luma)</source>
- <translation type="obsolete">最快 (沒有色度，部份的明度)</translation>
+ <location line="-3"/>
+ <source>Log</source>
+ <translation>Log</translation>
 </message>
 <message>
- <source>Fast (partial luma and chroma)</source>
- <translation type="obsolete">快 (部份明度和部份色度)</translation>
+ <location line="+2"/>
+ <source>EPZS</source>
+ <translation>EPZS</translation>
 </message>
 <message>
- <source>Medium (full luma, no chroma)</source>
- <translation type="obsolete">中 (全部的明度，沒有色度)</translation>
+ <location line="-3"/>
+ <source>Full</source>
+ <translation>全部</translation>
 </message>
 <message>
- <source>Slow (full luma and chroma)</source>
- <translation type="obsolete">慢 (全部的明度和色度)</translation>
+ <location line="+9"/>
+ <source>MPEG</source>
+ <translation>MPEG</translation>
 </message>
 <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
+ <location line="-10"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <source>_Quality:</source>
- <translation type="obsolete">品質(_Q):</translation>
+ <location line="+28"/>
+ <source>_Trellis quantization</source>
+ <translation>_網格量化:</translation>
 </message>
 <message>
- <source>_Threshold 1:</source>
- <translation type="obsolete">臨界值 1(_T):</translation>
+ <location line="-19"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
 </message>
 <message>
- <source>T_hreshold 2:</source>
- <translation type="obsolete">臨界值 2(_H):</translation>
+ <location line="-6"/>
+ <source>Phods</source>
+ <translation>Phods</translation>
 </message>
 <message>
- <source>C_ycle:</source>
- <translation type="obsolete">循環(_Y):</translation>
+ <location line="+24"/>
+ <source>Max. quantizer _difference:</source>
+ <translation>最大濾鏡器的_區別:</translation>
 </message>
 <message>
- <source>Decomb Decimate</source>
- <translation type="obsolete">去除梳形雜訊成批編碼器</translation>
+ <location line="-11"/>
+ <source>Rate distortion</source>
+ <translation>速率失真</translation>
 </message>
-</context>
-<context>
- <name>Dialog</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
- <source>Indexing</source>
- <translation type="unfinished">正在索引</translation>
+ <location line="+13"/>
+ <source>_Filesize tolerance (kb):</source>
+ <translation>_濾鏡大小容許誤差</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Time Left : Infinity</source>
- <translation type="unfinished"></translation>
+ <location line="+3"/>
+ <source>Quantizer _blur:</source>
+ <translation>量化器_模糊 :</translation>
 </message>
 <message>
- <location line="+1"/>
- <source># Images :</source>
- <translation type="unfinished"></translation>
+ <location line="+2"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop(圖像群組) 大小:</translation>
 </message>
-</context>
-<context>
- <name>DialogAudioTracks</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="+25"/>
- <source>Track 1</source>
- <translation type="unfinished">軌道 2: {1?}</translation>
+ <location line="+3"/>
+ <source>User Interface</source>
+ <translation>使用者介面</translation>
 </message>
 <message>
- <location line="+23"/>
- <location line="+41"/>
- <location line="+41"/>
- <location line="+41"/>
- <source>Configure</source>
- <translation type="unfinished">設定</translation>
+ <location line="-12"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
 </message>
 <message>
- <source>Audio Filters</source>
- <translation type="obsolete">音訊濾鏡</translation>
+ <location line="+17"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
 </message>
 <message>
- <location line="-105"/>
- <source>Track 2</source>
- <translation type="unfinished">軌道 2: {2?}</translation>
+ <location line="-28"/>
+ <source>MB comparison</source>
+ <translation>MB 比較</translation>
 </message>
 <message>
- <location line="+41"/>
- <source>Track 3</source>
- <translation type="unfinished">軌道 2: {3?}</translation>
+ <location line="+33"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
 </message>
 <message>
- <location line="+41"/>
- <source>Track 4</source>
- <translation type="unfinished">軌道 2: {4?}</translation>
+ <location line="-21"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大量化器:</translation>
 </message>
 <message>
- <location line="-93"/>
- <location line="+41"/>
- <location line="+41"/>
- <location line="+41"/>
- <source>Filters</source>
- <translation type="unfinished">濾鏡</translation>
+ <location line="+24"/>
+ <source>libavcodec FLV1 configuration</source>
+ <translation>libavcodec FLV1 配置</translation>
 </message>
 <message>
- <location line="-164"/>
- <source>Audio Tracks Configuration</source>
- <translation type="unfinished"></translation>
+ <location line="-35"/>
+ <source>Fewest bits (vhq)</source>
+ <translation>少位 (vhq)</translation>
 </message>
 <message>
- <location line="+18"/>
- <location line="+41"/>
- <location line="+41"/>
- <location line="+41"/>
- <source>Enabled</source>
- <translation type="unfinished"></translation>
+ <location line="+16"/>
+ <source>_Quantizer compression:</source>
+ <translation>_量化器壓縮：</translation>
 </message>
 </context>
 <context>
- <name>DialogOcr</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+13"/>
- <source>Dialog</source>
- <translation type="unfinished">對話窗</translation>
- </message>
+ <name>flvdemuxer</name>
 <message>
- <location line="+20"/>
- <source>Calibrate</source>
- <translation type="unfinished">校準</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+ <source>This FLV file says it has no video.
+I will assume it has and try to continue</source>
+ <translation>這個 FLV 檔說它有沒有影片。我將假設已並嘗試繼續</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Skip All</source>
- <translation type="unfinished">略過全部</translation>
+ <location line="+0"/>
+ <source>Warning</source>
+ <translation>警告</translation>
 </message>
+</context>
+<context>
+ <name>flvmuxer</name>
 <message>
- <location line="+7"/>
- <source>Skip Glyph</source>
- <translation type="unfinished">略過字形</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp" line="+68"/>
+ <location line="+10"/>
+ <location line="+6"/>
+ <source>Unsupported</source>
+ <translation>未支援的</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Ignore</source>
- <translation type="unfinished">忽略</translation>
+ <location line="-16"/>
+ <source>Only FLV1 &amp; VP6 supported for video</source>
+ <translation>只支援 FLV1 &amp; VP6 影片編碼</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Ok</source>
- <translation type="unfinished">確定</translation>
+ <location line="+16"/>
+ <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
+ <translation>僅 44.1, 22.050和 11.025 kHz 支援</translation>
 </message>
 <message>
- <location line="+18"/>
- <source>Close</source>
- <translation type="unfinished">關閉</translation>
+ <location line="-6"/>
+ <source>Only AAC &amp; mpegaudio supported for audio</source>
+ <translation>僅 AAC &amp; mpeg 音訊支援</translation>
 </message>
+</context>
+<context>
+ <name>gaussian</name>
 <message>
- <location line="+10"/>
- <source>00:00:00/000</source>
- <translation type="unfinished">00:00:00/000</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+27"/>
+ <source>3x3 convolution filter :gaussian.</source>
+ <translation>3x3高斯卷積濾鏡器 :(aussian convolution)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Timecode:</source>
- <translation type="unfinished">時間碼:</translation>
+ <location line="-1"/>
+ <source>Gaussian convolution.</source>
+ <translation>4.1-高斯卷積(3x3)矩陣-明度色度</translation>
 </message>
+</context>
+<context>
+ <name>glBenchmark</name>
 <message>
- <location line="+7"/>
- <source>0/0</source>
- <translation type="unfinished">0/0</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
+ <source>OpenGl ReadBack benchmark</source>
+ <translation type="unfinished">7.1-OpenGl 讀出基準</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Nb Lines :</source>
- <translation type="unfinished">線的數目 :</translation>
+ <location line="+1"/>
+ <source>Check how fast readback is.</source>
+ <translation type="unfinished">檢查如何快速讀出。</translation>
 </message>
 </context>
 <context>
- <name>DialogProcessing</name>
+ <name>glFragment</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+14"/>
- <source>Dialog</source>
- <translation type="unfinished">對話窗</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+69"/>
+ <source>Run a fragment shader.</source>
+ <translation type="unfinished">執行片段著色器。</translation>
 </message>
 <message>
- <location line="+33"/>
- <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
+ <location line="-1"/>
+ <source>OpenGl Fragment Shader Sample</source>
+ <translation type="unfinished">7.4- 片段著色器示例 1 (OpenGl)</translation>
 </message>
+</context>
+<context>
+ <name>glFragment2</name>
 <message>
- <location line="+34"/>
- <source>0</source>
- <translation type="unfinished">0</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+67"/>
+ <source>Run a fragment shader.</source>
+ <translation type="unfinished">執行片段著色器。</translation>
 </message>
 <message>
- <location line="-48"/>
- <source>Cancel</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>OpenGl Fragment Shader Sample2</source>
+ <translation type="unfinished">7.4- 片段著色器示例 2 (OpenGl)</translation>
+ </message>
+</context>
+<context>
+ <name>glResize</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+218"/>
+ <source>glResize</source>
+ <translation type="unfinished">g1調整大小</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>TimeLeft</source>
- <translation type="unfinished"></translation>
+ <location line="-152"/>
+ <source>OpenGl Resize</source>
+ <translation type="unfinished">7.2- 調整大小(OpenGl)</translation>
 </message>
 <message>
- <location line="+14"/>
- <source>ProcessImages</source>
- <translation type="unfinished"></translation>
+ <location line="+1"/>
+ <source>Resize using openGl.</source>
+ <translation type="unfinished">調整大小 OpenGl。</translation>
 </message>
 <message>
- <location line="+34"/>
- <source>Speed</source>
- <translation type="unfinished"></translation>
+ <location line="+147"/>
+ <source>Height :</source>
+ <translation type="unfinished">高 :</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>0 fps</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>Width :</source>
+ <translation type="unfinished">寬 :</translation>
 </message>
 </context>
 <context>
- <name>DialogProgress</name>
- <message>
- <location filename="../ADM_jobs/src/uiProgress.ui" line="+37"/>
- <source>1/1</source>
- <translation type="unfinished">1/1</translation>
- </message>
+ <name>glRotate</name>
 <message>
- <location line="+14"/>
- <source>...</source>
- <translation type="unfinished">...</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+181"/>
+ <source>glRotate</source>
+ <translation type="unfinished">gl旋轉</translation>
 </message>
 <message>
- <location line="-34"/>
- <source>Progress</source>
- <translation type="unfinished"></translation>
+ <location line="-124"/>
+ <source>OpenGl Rotate</source>
+ <translation type="unfinished">7.3- 旋轉(OpenGl)</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Current job</source>
- <translation type="unfinished"></translation>
+ <location line="+1"/>
+ <source>Rotate image by a small amount.</source>
+ <translation type="unfinished">通過少量的旋轉圖像。</translation>
 </message>
 <message>
- <location line="+14"/>
- <source>File being written </source>
- <translation type="unfinished"></translation>
+ <location line="+118"/>
+ <source>Angle (°):</source>
+ <translation type="unfinished">角度 (°):</translation>
 </message>
 </context>
 <context>
- <name>EncoderCopy</name>
+ <name>glSample</name>
 <message>
- <source>Copy</source>
- <translation type="obsolete">複製</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+69"/>
+ <source>Run a fragment shader.</source>
+ <translation type="unfinished">執行片段著色器。</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>OpenGl Fragment Shader Sample</source>
+ <translation type="unfinished">7.4-OpenGl 片段著色器示例</translation>
 </message>
 </context>
 <context>
- <name>EncoderRequant</name>
+ <name>glShader</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+15"/>
+ <source>ShaderLoader</source>
+ <translation type="unfinished">7.8-著色器載入(OpenGl)</translation>
+ </message>
+ <message>
+ <location line="-196"/>
+ <source>Run an external shader program.</source>
+ <translation type="unfinished">執行外部著色器程式。</translation>
+ </message>
+ <message>
+ <location line="+192"/>
+ <source>ShaderFile to load</source>
+ <translation type="unfinished">著色檔要載入</translation>
+ </message>
 <message>
- <source>Requant</source>
- <translation type="obsolete">重複量化</translation>
+ <location line="-193"/>
+ <source>Shader Loader</source>
+ <translation type="unfinished">7.6-載入著色器</translation>
 </message>
 </context>
 <context>
- <name>EncoderYV12</name>
+ <name>glSmooth</name>
 <message>
- <source>YV12</source>
- <translation type="obsolete">YV12</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp" line="+61"/>
+ <source>OpenGl Smooth</source>
+ <translation type="unfinished">7.7- 光滑(OpenGl)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Smooth image while preserving edge.</source>
+ <translation type="unfinished">同時保留邊緣平滑的圖像。</translation>
 </message>
 </context>
 <context>
- <name>EqualiserDialog</name>
+ <name>glVdpaufilter</name>
 <message>
- <source>Equaliser</source>
- <translation type="obsolete">等化器</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+276"/>
+ <source>vdpau</source>
+ <translation type="unfinished">vdpau</translation>
 </message>
 <message>
- <source>Settings</source>
- <translation type="obsolete">設定</translation>
+ <location line="-6"/>
+ <source>_Deint Mode:</source>
+ <translation type="unfinished">_去交錯模式：</translation>
 </message>
 <message>
- <source>Histogram</source>
- <translation type="obsolete">分佈圖</translation>
+ <location line="-1"/>
+ <source>_Resize:</source>
+ <translation type="unfinished">_調整大小</translation>
 </message>
-</context>
-<context>
- <name>FDK-AAC</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
- <source>_Profile::</source>
- <translation type="unfinished"></translation>
+ <location line="-6"/>
+ <source>Keep Top Field</source>
+ <translation type="unfinished">維持頂部掃描場</translation>
 </message>
 <message>
 <location line="+1"/>
- <location line="+9"/>
- <source>_Bitrate:</source>
- <translation type="unfinished"></translation>
+ <source>Keep Bottom Field</source>
+ <translation type="unfinished">維持底部掃描場</translation>
 </message>
 <message>
- <location line="-7"/>
- <source>SBR enabled</source>
- <translation type="unfinished"></translation>
+ <location line="+8"/>
+ <source>Height :</source>
+ <translation type="unfinished">高</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+7"/>
- <source>After burner</source>
- <translation type="unfinished"></translation>
+ <location line="-187"/>
+ <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
+ <translation type="unfinished">VDPAU 去交錯化 + 調整大小，openGl 版本 （更快）。</translation>
 </message>
 <message>
- <location line="-3"/>
- <location line="+5"/>
- <source>FDK-AAC Configuration</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>vdpauDeintGl</source>
+ <translation type="unfinished">7.8-vdpauDeintGl</translation>
 </message>
-</context>
-<context>
- <name>FLV1Encoder</name>
 <message>
- <source>_Bitrate (kb/s):</source>
- <translation type="obsolete">位元率 (kb/s)(_B):</translation>
+ <location line="+187"/>
+ <source>Width :</source>
+ <translation type="unfinished">寬</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Double framerate</source>
+ <translation type="unfinished">雙倍幀率</translation>
 </message>
+</context>
+<context>
+ <name>glVertex</name>
 <message>
- <source>_GOP size:</source>
- <translation type="obsolete">_GOP 大小:</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+60"/>
+ <source>Run a simple vertex shader.</source>
+ <translation type="unfinished">執行一個簡單的頂點著色器。</translation>
 </message>
 <message>
- <source>Settings</source>
- <translation type="obsolete">設定</translation>
+ <location line="-1"/>
+ <source>OpenGl Vertex Shader</source>
+ <translation type="unfinished">7.6- 頂點著色器(OpenGl)</translation>
 </message>
 </context>
 <context>
- <name>GUIPlayback</name>
+ <name>glWave</name>
 <message>
- <source>Trouble initializing audio device</source>
- <translation type="obsolete">音訊裝置初始化時發生問題</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp" line="+60"/>
+ <source>Simple wave filter.</source>
+ <translation type="unfinished">簡單波紋效果</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>OpenGl wave </source>
+ <translation type="unfinished">7.2- 波紋效果(OpenGl)</translation>
 </message>
 </context>
 <context>
- <name>GenericAviSave</name>
+ <name>glYadif</name>
 <message>
- <source>Error initalizing audio filters</source>
- <translation type="obsolete">初始化音訊濾鏡發生錯誤</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+275"/>
+ <source>yadif</source>
+ <translation type="unfinished">2.1-亞迪夫(yadif)濾鏡器</translation>
 </message>
 <message>
- <source>Error initalizing video filters</source>
- <translation type="obsolete">初始化視訊濾鏡發生錯誤</translation>
+ <location line="-197"/>
+ <source>Yet another deinterlacer, using shaders.</source>
+ <translation type="unfinished">然而另一個去交錯化，使用著色器。</translation>
 </message>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location line="-1"/>
+ <source>Yadif (openGl)</source>
+ <translation type="unfinished">7.1-亞迪夫(yadif) (openGl)</translation>
 </message>
 <message>
- <source>Copy</source>
- <translation type="obsolete">複製</translation>
+ <location line="+190"/>
+ <source>Top field first</source>
+ <translation type="unfinished">頂部首先掃描</translation>
 </message>
 <message>
- <source>AVI</source>
- <translation type="obsolete">AVI</translation>
+ <location line="+4"/>
+ <source>_Order:</source>
+ <translation type="unfinished">_順序:</translation>
 </message>
 <message>
- <source>Cannot initiate save</source>
- <translation type="obsolete">無法開始儲存</translation>
+ <location line="-1"/>
+ <source>_Mode:</source>
+ <translation type="unfinished">_模式:</translation>
 </message>
-</context>
-<context>
- <name>GenericAviSaveCopy</name>
 <message>
- <source>Cannot initiate save</source>
- <translation type="obsolete">無法開始儲存</translation>
+ <location line="-10"/>
+ <source>Temporal &amp; spatial check</source>
+ <translation type="unfinished">時間 &amp; 空間的檢查</translation>
 </message>
 <message>
- <source>Saving</source>
- <translation type="obsolete">正在儲存</translation>
+ <location line="+1"/>
+ <source>Bob, temporal &amp; spatial check</source>
+ <translation type="unfinished">振動，時間 &amp; 空間檢查</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Bob, skip spatial temporal check</source>
+ <translation type="unfinished">振動，略過時間空間檢查</translation>
 </message>
-</context>
-<context>
- <name>GenericAviSaveCopyPack</name>
 <message>
- <source>Cannot initiate save</source>
- <translation type="obsolete">無法開始儲存</translation>
+ <location line="-1"/>
+ <source>Skip spatial temporal check</source>
+ <translation type="unfinished">略過時間空間檢查</translation>
 </message>
 <message>
- <source>Saving</source>
- <translation type="obsolete">正在儲存</translation>
+ <location line="+4"/>
+ <source>Bottom field first</source>
+ <translation type="unfinished">底部首先掃描</translation>
 </message>
 </context>
 <context>
- <name>GenericAviSaveCopyUnpack</name>
+ <name>hflip</name>
 <message>
- <source>Cannot initiate save</source>
- <translation type="obsolete">無法開始儲存</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+45"/>
+ <source>Horizontally flip the image.</source>
+ <translation>水平翻轉圖像-對Y軸翻轉</translation>
 </message>
 <message>
- <source>Saving</source>
- <translation type="obsolete">正在儲存</translation>
+ <location line="-1"/>
+ <source>Horizontal Flip</source>
+ <translation>1.1-左右顛倒</translation>
 </message>
 </context>
 <context>
- <name>GenericAviSaveProcess</name>
+ <name>histogram</name>
 <message>
- <source>Width is not a multiple of 8
- continue anyway ?</source>
- <translation type="obsolete">寬度不是 8 的倍數
- 無論如何都繼續嗎 ?</translation>
+ <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+220"/>
+ <source>Bitrate Histogram</source>
+ <translation>位元率分佈圖</translation>
 </message>
 <message>
- <source>Filter init failed</source>
- <translation type="obsolete">濾鏡初始化失敗</translation>
+ <location line="-18"/>
+ <source>Max. bitrate:</source>
+ <translation>最大位元率:</translation>
 </message>
 <message>
- <source>1st Pass</source>
- <translation type="obsolete">第一次運算</translation>
+ <location line="-146"/>
+ <location line="+75"/>
+ <source>No data</source>
+ <translation>沒有資料</translation>
 </message>
 <message>
- <source>Aborting</source>
- <translation type="obsolete">正在中止</translation>
+ <location line="+76"/>
+ <source>Max. B frames:</source>
+ <translation>最大 B 幀數:</translation>
 </message>
 <message>
- <source>Encoding</source>
- <translation type="obsolete">正在編碼</translation>
+ <location line="-4"/>
+ <source>Average bitrate:</source>
+ <translation>平均位元率(ABR):</translation>
 </message>
 <message>
- <source>2nd Pass</source>
- <translation type="obsolete">第二次運算</translation>
+ <location line="+2"/>
+ <source>Number of P frames:</source>
+ <translation>P 幀數目:</translation>
 </message>
 <message>
- <source>Reuse the existing log file?</source>
- <translation type="obsolete">重複使用現有的日誌檔?</translation>
+ <location line="+1"/>
+ <source>Number of B frames:</source>
+ <translation>B 幀數目:</translation>
 </message>
-</context>
-<context>
- <name>GenericAviSaveSmart</name>
 <message>
- <source>Smart Copy</source>
- <translation type="obsolete">智慧型複製</translation>
+ <location line="-2"/>
+ <source>Number of I frames:</source>
+ <translation>I 幀數目:</translation>
 </message>
 </context>
 <context>
- <name>GlyphEditorDialog</name>
+ <name>hue</name>
 <message>
- <source>Glyph Editor</source>
- <translation type="obsolete">字形編輯器</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
+ <source>Adjust hue and saturation.</source>
+ <translation>調整色相和飽和度。</translation>
 </message>
 <message>
- <source>Prev. Empty</source>
- <translation type="obsolete">上一個是空的</translation>
+ <location line="-1"/>
+ <source>Mplayer Hue</source>
+ <translation>3.2-Mplayer Hue(色階)</translation>
 </message>
+</context>
+<context>
+ <name>hueDialog</name>
 <message>
- <source>Home</source>
- <translation type="obsolete">家目錄</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui" line="+14"/>
+ <location line="+45"/>
+ <source>Hue</source>
+ <translation>色階</translation>
 </message>
 <message>
- <source>Next</source>
- <translation type="obsolete">下一個</translation>
+ <location line="+20"/>
+ <source>Saturation</source>
+ <translation>飽和度</translation>
 </message>
+</context>
+<context>
+ <name>huff</name>
 <message>
- <source>Find</source>
- <translation type="obsolete">尋找</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+114"/>
+ <source>Type:</source>
+ <translation>型:</translation>
 </message>
 <message>
- <source>Previous</source>
- <translation type="obsolete">上一個</translation>
+ <location line="+3"/>
+ <source>HuffYUV Configuration</source>
+ <translation>HuffYUV配置</translation>
 </message>
 <message>
- <source>Next Empty</source>
- <translation type="obsolete">下一個是空的</translation>
+ <location line="-13"/>
+ <source>HUFFYUV</source>
+ <translation>HUFFYUV</translation>
 </message>
 <message>
- <source>Delete</source>
- <translation type="obsolete">刪除</translation>
+ <location line="+1"/>
+ <source>FF HUFFYUV</source>
+ <translation>FF HUFFYUV</translation>
 </message>
 </context>
 <context>
- <name>GlyphEditorWindow</name>
+ <name>hzstackfield</name>
 <message>
- <source>Head reached</source>
- <translation type="obsolete">延伸最前的部分</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
+ <source>Horizontal Stack Fields</source>
+ <translation>2.8-水平堆疊掃描場-左右併排</translation>
 </message>
 <message>
- <source>No more glyphs</source>
- <translation type="obsolete">不能再多字形</translation>
+ <location line="+1"/>
+ <source>Put fields side by side.</source>
+ <translation>掃描場併排，是用來看看一些並排情況，如需改進。</translation>
 </message>
+</context>
+<context>
+ <name>indexing</name>
 <message>
- <source>End reached</source>
- <translation type="obsolete">已到結束點</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+17"/>
+ <source>Do you want to abort indexing ?</source>
+ <translation>你想要中止索引嗎？</translation>
 </message>
 <message>
- <source>String</source>
- <translation type="obsolete">字串</translation>
+ <location line="+0"/>
+ <source>Continue indexing</source>
+ <translation>繼續編制索引</translation>
 </message>
 <message>
- <source>Search string</source>
- <translation type="obsolete">搜尋字串</translation>
+ <location line="+76"/>
+ <source>Time Left :%02d:%02d:%02d</source>
+ <translation>剩餘時間：%02d:%02d:%02d</translation>
 </message>
 <message>
- <source>Select GlyphFile to edit</source>
- <translation type="obsolete">選擇字形檔進行編輯</translation>
+ <location line="-76"/>
+ <source>Abort Requested</source>
+ <translation>中止請求</translation>
 </message>
 </context>
 <context>
- <name>H263Encoder</name>
+ <name>ivtcRemover</name>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+142"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+431"/>
+ <source>Fast</source>
+ <translation>快</translation>
 </message>
 <message>
+ <location line="-1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-1"/>
 <source>Full</source>
- <translation type="obsolete">全部</translation>
+ <translation>全部</translation>
 </message>
 <message>
- <source>Log</source>
- <translation type="obsolete">Log</translation>
+ <location line="-6"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-5"/>
+ <source>_Noise:</source>
+ <translation>_雜訊:</translation>
 </message>
 <message>
- <source>EPZS</source>
- <translation type="obsolete">EPZS</translation>
+ <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+ <source>_Show:</source>
+ <translation>_慢慢</translation>
 </message>
 <message>
- <source>H.263</source>
- <translation type="obsolete">H.263</translation>
+ <location line="+1"/>
+ <source>_Remove duplicate:</source>
+ <translation>_刪除重複：</translation>
 </message>
 <message>
- <source>MPEG</source>
- <translation type="obsolete">MPEG</translation>
+ <location line="+14"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+14"/>
+ <source>DupeRemover</source>
+ <translation>刪除重複的幀</translation>
 </message>
 <message>
- <source>Motion Estimation</source>
- <translation type="obsolete">動作估測</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-349"/>
+ <source>Remove IVTC dupe.</source>
+ <translation>2.6-刪除重複的幀(IVTC)。</translation>
 </message>
 <message>
- <source>Incompatible settings</source>
- <translation type="obsolete">不相容的設定</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-8"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+341"/>
+ <source>VeryFast</source>
+ <translation>非常快</translation>
 </message>
-</context>
-<context>
- <name>MP4Header</name>
 <message>
- <source>Problem reading SVQ3 headers</source>
- <translation type="obsolete">讀取 SVQ3 檔頭時發生問題</translation>
+ <location line="+5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+ <source>_Frame rate change:</source>
+ <translation>_幀率改變:</translation>
 </message>
 <message>
- <source>No stts table</source>
- <translation type="obsolete">沒有 stts 表</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-345"/>
+ <source>Remove the duplicate frames present after ivtc.</source>
+ <translation>刪除重複的幀(IVTC)和PAL智慧型一樣</translation>
 </message>
 </context>
 <context>
- <name>MPDelogoDialog</name>
+ <name>jobs</name>
 <message>
- <source>MPlayer Delogo</source>
- <translation type="obsolete">MPlayer 去圖標</translation>
+ <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+ <source>Oops</source>
+ <translation>Oops</translation>
 </message>
 <message>
- <source>Band:</source>
- <translation type="obsolete">波段:</translation>
+ <location filename="../ADM_jobs/src/uiJobs.ui" line="+71"/>
+ <source>Quit</source>
+ <translation>離開</translation>
 </message>
 <message>
- <source>Height:</source>
- <translation type="obsolete">高度:</translation>
+ <location line="-33"/>
+ <source>Delete already executed jobs</source>
+ <translation>刪除以執行的工作</translation>
 </message>
 <message>
- <source>Width:</source>
- <translation type="obsolete">寬度:</translation>
+ <location line="-21"/>
+ <source>Avidemux Jobs</source>
+ <translation>Avidemux工作</translation>
 </message>
 <message>
- <source>Y:</source>
- <translation type="obsolete">Y:</translation>
+ <location filename="../../common/GUI_jobs.cpp" line="+6"/>
+ <source>There are no jobs stored</source>
+ <translation>沒有儲存任何工作</translation>
 </message>
 <message>
- <source>X:</source>
- <translation type="obsolete">X:</translation>
+ <location filename="../ADM_jobs/src/uiJobs.ui" line="+24"/>
+ <source>Cleanup</source>
+ <translation>清理</translation>
 </message>
-</context>
-<context>
- <name>MainWindow</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+15"/>
- <source>Avidemux</source>
- <translation type="unfinished">Avidemux</translation>
+ <location line="+10"/>
+ <source>use Qt version</source>
+ <translation>使用 Qt 版本</translation>
 </message>
 <message>
- <source>&lt;b&gt;Video&lt;/b&gt;</source>
- <translation type="obsolete">&lt;b&gt;視訊&lt;/b&gt;</translation>
+ <location line="-20"/>
+ <source>Run jobs</source>
+ <translation>執行工作</translation>
 </message>
 <message>
- <location line="+468"/>
- <location line="+169"/>
- <source>Copy</source>
- <translation type="unfinished">複製</translation>
+ <location filename="../../common/GUI_jobs.cpp" line="-6"/>
+ <source>Something very wrong happened when building joblist.</source>
+ <translation>建立工作列表時發生某些重大錯誤。</translation>
 </message>
 <message>
- <location line="-294"/>
- <location line="+142"/>
- <location line="+169"/>
- <location line="+181"/>
- <source>Configure</source>
- <translation type="unfinished">設定</translation>
+ <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
+ <source>If you use VDPAU you cannot use CLI version</source>
+ <translation>如果你使用 VDPAU 你不能使用 CLI 版本</translation>
 </message>
 <message>
- <location line="-592"/>
- <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <location line="-20"/>
+ <source>Run all pending jobs</source>
+ <translation>運行所有掛起的作業</translation>
 </message>
+</context>
+<context>
+ <name>jobsDialog</name>
 <message>
- <location line="+258"/>
- <location line="+169"/>
- <source>Filters</source>
- <translation type="unfinished">濾鏡</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
+ <source>Jobs</source>
+ <translation>工作</translation>
 </message>
 <message>
- <source>&lt;b&gt;Audio&lt;/b&gt;</source>
- <translation type="obsolete">&lt;b&gt;音訊&lt;/b&gt;</translation>
+ <location line="+44"/>
+ <source>Delete All Jobs</source>
+ <translation>刪除所有工作</translation>
 </message>
 <message>
- <location line="+27"/>
- <source>&amp;Shift:</source>
- <translation type="unfinished">位移(&amp;S):</translation>
+ <location line="+7"/>
+ <source>Run All Jobs</source>
+ <translation>執行所有工作</translation>
 </message>
 <message>
- <location line="+32"/>
- <source>ms</source>
- <translation type="unfinished">ms</translation>
+ <location line="-14"/>
+ <source>Delete Sel. Job</source>
+ <translation>刪除選擇的工作</translation>
 </message>
 <message>
- <source>&lt;b&gt;Format&lt;/b&gt;</source>
- <translation type="obsolete">&lt;b&gt;格式&lt;/b&gt;</translation>
+ <location line="+21"/>
+ <source>Run Selected Job</source>
+ <translation>執行選擇的工作</translation>
 </message>
+</context>
+<context>
+ <name>jpeg</name>
 <message>
- <location line="+233"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+26"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+23"/>
- <location line="+26"/>
- <location line="+344"/>
- <source>...</source>
- <translation type="unfinished">...</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+96"/>
+ <source>_ColorSpace:</source>
+ <translation>_色彩空間：</translation>
 </message>
 <message>
- <source>Frame:</source>
- <translation type="obsolete">畫格:</translation>
+ <location line="+4"/>
+ <source>Mjpeg Configuration</source>
+ <translation>Mjpeg 配置</translation>
 </message>
 <message>
- <source>0</source>
- <translation type="obsolete">0</translation>
+ <location line="-5"/>
+ <source>_Quantizer:</source>
+ <translation>_量化器:</translation>
 </message>
 <message>
- <source>/ 0</source>
- <translation type="obsolete">/ 0</translation>
+ <location line="-11"/>
+ <source>YUV420</source>
+ <translation>YUV420</translation>
 </message>
 <message>
- <location line="-289"/>
- <source>Time:</source>
- <translation type="unfinished">時間:</translation>
+ <location line="-1"/>
+ <source>YUV422</source>
+ <translation>YUV422</translation>
 </message>
+</context>
+<context>
+ <name>kerneldeint</name>
 <message>
- <location line="+18"/>
- <source>00:00:00.000</source>
- <translation type="unfinished">00:00:00.000</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="+65"/>
+ <source>Top</source>
+ <translation>頂部</translation>
 </message>
 <message>
- <location line="+22"/>
- <source>/ 00:00:00.000</source>
- <translation type="unfinished">/ 00:00:00.000</translation>
+ <location line="+9"/>
+ <source>_Map</source>
+ <translation>_網圖</translation>
 </message>
 <message>
- <source>Frame Type:</source>
- <translation type="obsolete">畫格類型:</translation>
+ <location line="-1"/>
+ <source>Extrapolate better (better not to use it)</source>
+ <translation>推算較好的 (最好不使用它)</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>?</source>
- <translation type="unfinished">?</translation>
+ <location line="-2"/>
+ <source>Smaller means more deinterlacing</source>
+ <translation>越小表示更多的去交錯</translation>
 </message>
 <message>
- <source>Selection</source>
- <translation type="obsolete">選取</translation>
+ <location line="-5"/>
+ <source>Bottom</source>
+ <translation>底部</translation>
 </message>
 <message>
- <location line="+111"/>
- <source>A:</source>
- <translation type="unfinished">A:</translation>
+ <location line="+6"/>
+ <source>_Sharper engine:</source>
+ <translation>_清晰化引擎:</translation>
 </message>
 <message>
- <location line="+17"/>
- <location line="+10"/>
- <source>000000</source>
- <translation type="unfinished">000000</translation>
+ <location line="-22"/>
+ <source>Kernel Deint.</source>
+ <translation>2.2-內核去交錯(KernelDeint)-去尖銳網圖</translation>
 </message>
 <message>
- <location line="-20"/>
- <source>B:</source>
- <translation type="unfinished">B:</translation>
+ <location line="+1"/>
+ <source>Port of Donald Graft Kernel Deinterlacer.</source>
+ <translation>唐納德(Donald Graft)的內核去交錯器端口</translation>
 </message>
 <message>
- <location line="-1394"/>
- <source>&amp;Help</source>
- <translation type="unfinished">說明(&amp;H)</translation>
+ <location line="+21"/>
+ <source>_Sharp</source>
+ <translation>_銳利</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Vi&amp;deo</source>
- <translation type="unfinished">視訊(&amp;D)</translation>
+ <location line="-2"/>
+ <source>_Field order:</source>
+ <translation>_掃描場順序</translation>
 </message>
 <message>
- <location line="+46"/>
- <source>&amp;Audio</source>
- <translation type="unfinished">音訊(&amp;A)</translation>
+ <location line="+3"/>
+ <source>T_woway</source>
+ <translation>雙_向</translation>
 </message>
 <message>
- <location line="-5"/>
- <source>&amp;Tools</source>
- <translation type="unfinished">工具(&amp;T)</translation>
+ <location line="+5"/>
+ <source>KernelDeint</source>
+ <translation>2.2-內核去交錯(KernelDeint)-去尖銳網圖</translation>
 </message>
 <message>
- <location line="-36"/>
- <source>&amp;Edit</source>
- <translation type="unfinished">編輯(&amp;E)</translation>
+ <location line="-7"/>
+ <source>_Threshold:</source>
+ <translation>_界限值:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>&amp;View</source>
- <translation type="unfinished">檢視(&amp;V)</translation>
+ <location line="+3"/>
+ <source>Show interlaced areas (for test!)</source>
+ <translation>顯示交錯的範圍(測試用！)</translation>
+ </message>
+</context>
+<context>
+ <name>lame</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+311"/>
+ <source>ABR</source>
+ <translation>ABR</translation>
 </message>
 <message>
- <source>&amp;Preview Mode</source>
- <translation type="obsolete">預覽模式(&amp;P)</translation>
+ <location line="-1"/>
+ <source>CBR</source>
+ <translation>CBR</translation>
 </message>
 <message>
 <location line="+21"/>
- <source>&amp;Custom</source>
- <translation type="unfinished">自訂(&amp;C)</translation>
+ <source>_Bitrate:</source>
+ <translation>_位元率:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>&amp;Go</source>
- <translation type="unfinished">前往(&amp;G)</translation>
+ <location line="+9"/>
+ <source>LAME Configuration</source>
+ <translation>LAME 配置</translation>
 </message>
 <message>
- <source>A&amp;uto</source>
- <translation type="obsolete">自動(&amp;U)</translation>
+ <location line="-27"/>
+ <source>Bit_rate mode:</source>
+ <translation>位元_率模式:</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>&amp;File</source>
- <translation type="unfinished">檔案(&amp;F)</translation>
+ <location line="+20"/>
+ <source>_Quality:</source>
+ <translation>_品質:</translation>
 </message>
 <message>
- <source>&amp;Recent Files</source>
- <translation type="obsolete">最近開啟的檔案(&amp;R)</translation>
+ <location line="+3"/>
+ <source>_Disable reservoir:</source>
+ <translation>_停用貯存</translation>
 </message>
+</context>
+<context>
+ <name>largemedian</name>
 <message>
- <source>&amp;Save</source>
- <translation type="obsolete">儲存(&amp;S)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+36"/>
+ <source>Large Median (5x5).</source>
+ <translation>4.1-大中位數卷積(5x5)矩陣-明度色度。</translation>
 </message>
 <message>
- <location line="+1530"/>
- <source>&amp;Open...</source>
- <translation type="unfinished">開啟(&amp;O)...</translation>
+ <location line="+40"/>
+ <source>Fast Convolution</source>
+ <translation>快速卷積</translation>
 </message>
 <message>
- <source>Ctrl+O</source>
- <translation type="obsolete">Ctrl+O</translation>
+ <location line="-5"/>
+ <source>Process luma plane</source>
+ <translation>處理明度平面</translation>
 </message>
 <message>
- <source>&amp;Append...</source>
- <translation type="obsolete">添加(&amp;A)...</translation>
+ <location line="+0"/>
+ <source>_Process luma</source>
+ <translation>_處理明度</translation>
 </message>
 <message>
- <source>Ctrl+Alt+A</source>
- <translation type="obsolete">Ctrl+Alt+A</translation>
+ <location line="-34"/>
+ <source>Median filter on 5x5 matrix.</source>
+ <translation>5 x 5 矩陣的中值濾鏡。</translation>
 </message>
 <message>
- <source>Cu&amp;t</source>
- <translation type="obsolete">剪下(&amp;T)</translation>
+ <location line="+35"/>
+ <source>P_rocess chroma</source>
+ <translation>處_理色度</translation>
 </message>
+</context>
+<context>
+ <name>lavcodec</name>
 <message>
- <source>Ctrl+X</source>
- <translation type="obsolete">Ctrl+X</translation>
+ <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+ <source>_Bitrate:</source>
+ <translation>_位元率:</translation>
 </message>
+</context>
+<context>
+ <name>lavdecoder</name>
 <message>
- <source>&amp;Copy</source>
- <translation type="obsolete">複製(&amp;C)</translation>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
+ <source>_Swap U and V</source>
+ <translation>_U和V交換色彩</translation>
 </message>
 <message>
- <source>Ctrl+C</source>
- <translation type="obsolete">Ctrl+C</translation>
+ <location line="+1"/>
+ <source>Show motion _vectors</source>
+ <translation>顯示向量_運動</translation>
 </message>
 <message>
- <source>&amp;Paste</source>
- <translation type="obsolete">貼上(&amp;P)</translation>
+ <location line="+2"/>
+ <source>Decoder Options</source>
+ <translation>解碼器選項</translation>
 </message>
+</context>
+<context>
+ <name>lavdeint</name>
 <message>
- <source>Ctrl+V</source>
- <translation type="obsolete">Ctrl+V</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+188"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <source>&amp;Delete</source>
- <translation type="obsolete">刪除(&amp;D)</translation>
+ <location line="-116"/>
+ <source>Lavcodec deinterlacer family.</source>
+ <translation>libav編解碼去交錯濾鏡家族</translation>
 </message>
 <message>
- <source>Del</source>
- <translation type="obsolete">Del</translation>
+ <location line="+117"/>
+ <source>Linear blend</source>
+ <translation>線性混合</translation>
 </message>
 <message>
- <source>Set Marker A</source>
- <translation type="obsolete">設定標記 A</translation>
+ <location line="+13"/>
+ <source>libavcodec deinterlacer</source>
+ <translation>2.3-立巴扣疊克(libavcodec)-各種插值自動色階</translation>
 </message>
 <message>
- <source>[</source>
- <translation type="obsolete">[</translation>
+ <location line="-12"/>
+ <source>Linear interpolate</source>
+ <translation>線性插值</translation>
 </message>
 <message>
- <source>Set Marker B</source>
- <translation type="obsolete">設定標記 B</translation>
+ <location line="-119"/>
+ <source>Libavdec Deinterlacers</source>
+ <translation>2.3-立巴扣疊克(libavcodec)-各種插值自動色階</translation>
 </message>
 <message>
- <source>]</source>
- <translation type="obsolete">]</translation>
+ <location line="+127"/>
+ <source>_Autolevel</source>
+ <translation>_自動色階</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>&amp;Information...</source>
- <translation type="unfinished">資訊(&amp;I)...</translation>
+ <location line="-6"/>
+ <source>Median interpolate</source>
+ <translation>中位插值</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Alt+Return</source>
- <translation type="unfinished">Alt+Return</translation>
+ <location line="-1"/>
+ <source>Cubic interpolate</source>
+ <translation>立方插值</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Save &amp;Video...</source>
- <translation type="unfinished">儲存影片(&amp;V)...</translation>
+ <location line="+2"/>
+ <source>FFmpeg deint</source>
+ <translation>FFmpeg 去交錯</translation>
 </message>
 <message>
- <location line="+3"/>
- <location line="+3"/>
- <source>Save Video</source>
- <translation type="unfinished">儲存影片</translation>
+ <location line="+4"/>
+ <source>_Deinterlacing:</source>
+ <translation>_去交錯:</translation>
 </message>
+</context>
+<context>
+ <name>licenseDialog</name>
 <message>
- <source>Ctrl+S</source>
- <translation type="obsolete">Ctrl+S</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+62"/>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
 <message>
- <source>Save &amp;BMP Image...</source>
- <translation type="obsolete">儲存 &amp;BMP 圖像...</translation>
+ <location line="-46"/>
+ <source>License</source>
+ <translation>授權</translation>
 </message>
+</context>
+<context>
+ <name>logo</name>
 <message>
- <source>Save BMP Image</source>
- <translation type="obsolete">儲存 BMP 圖像</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+23"/>
+ <source>Put a logo on top of video, with alpha blending.</source>
+ <translation>把標誌上方帶有 alpha(半)混合影片</translation>
 </message>
 <message>
- <source>Save &amp;JPEG Image...</source>
- <translation type="obsolete">儲存 &amp;JPEG 圖像...</translation>
+ <location line="-1"/>
+ <source>Add logo</source>
+ <translation>1.0-加入標誌-匯入logo圖片</translation>
 </message>
 <message>
- <source>Save JPEG Image</source>
- <translation type="obsolete">儲存 JPEG 圖像</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
+ <source>Select Logo Image</source>
+ <translation>選擇標誌圖像</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>&amp;Load/Run Project...</source>
- <translation type="unfinished">載入/執行專案(&amp;L)...</translation>
+ <location line="+72"/>
+ <source> s</source>
+ <translation type="unfinished"></translation>
 </message>
+</context>
+<context>
+ <name>logoDialog</name>
 <message>
- <location line="+3"/>
- <location line="+3"/>
- <source>Load/Run Project</source>
- <translation type="unfinished">載入/執行專案</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+64"/>
+ <source>X</source>
+ <translation>X</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Save &amp;Project</source>
- <translation type="unfinished">儲存專案(&amp;P)</translation>
+ <location line="+17"/>
+ <source>Y</source>
+ <translation>Y</translation>
 </message>
 <message>
- <location line="+3"/>
- <location line="+3"/>
- <source>Save Project</source>
- <translation type="unfinished">儲存專案</translation>
+ <location line="-67"/>
+ <source>Logo</source>
+ <translation>標誌</translation>
 </message>
 <message>
- <source>Save P&amp;roject As...</source>
- <translation type="obsolete">另存專案(&amp;R)...</translation>
+ <location line="+87"/>
+ <source>Alpha</source>
+ <translation>Alpha透明</translation>
 </message>
 <message>
- <source>Save Project As</source>
- <translation type="obsolete">另存專案</translation>
+ <location line="-77"/>
+ <location line="+7"/>
+ <source>Image</source>
+ <translation>圖像</translation>
 </message>
 <message>
- <source>&amp;Zoom 1:4</source>
- <translation type="obsolete">縮放為 1:4(&amp;Z)</translation>
+ <location line="+7"/>
+ <source>Select</source>
+ <translation>選擇</translation>
 </message>
 <message>
- <source>Ctrl+Shift+4</source>
- <translation type="obsolete">Ctrl+Shift+4</translation>
+ <location line="+83"/>
+ <source>Fade-in/out</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Z&amp;oom 1:2</source>
- <translation type="obsolete">縮放為 1:2(&amp;O)</translation>
+ <location line="+65"/>
+ <source>You can click in the image to approximately position the logo</source>
+ <translation>您可以按一下圖像去設置近似的標誌</translation>
 </message>
 <message>
- <source>Ctrl+Shift+2</source>
- <translation type="obsolete">Ctrl+Shift+2</translation>
+ <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+ <translation type="vanished">如果圖像 Alpha 色板 (RGB 的 png)，Alpha 將被忽略</translation>
 </message>
+</context>
+<context>
+ <name>lumaonly</name>
 <message>
- <source>Zoom &amp;1:1</source>
- <translation type="obsolete">縮放為 &amp;1:1</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
+ <source>GreyScale</source>
+ <translation>3.1-GreyScale(灰階)</translation>
 </message>
 <message>
- <source>Ctrl+Alt+1</source>
- <translation type="obsolete">Ctrl+Alt+1</translation>
+ <location line="+1"/>
+ <source>Remove color, only key grey image.</source>
+ <translation>刪除顏色，只保留關鍵灰色度圖像</translation>
 </message>
+</context>
+<context>
+ <name>mainFilterDialog</name>
 <message>
- <source>Zoom &amp;2:1</source>
- <translation type="obsolete">縮放為 &amp;2:1</translation>
+ <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+227"/>
+ <source>Noise</source>
+ <translation>雜訊-清除</translation>
 </message>
 <message>
- <source>Ctrl+Alt+2</source>
- <translation type="obsolete">Ctrl+Alt+2</translation>
+ <location line="-146"/>
+ <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
+ <translation>&lt;big&gt;&lt;b&gt;選用的濾鏡器&lt;/b&gt;&lt;/big&gt;</translation>
 </message>
 <message>
- <source>&amp;Decoder Options...</source>
- <translation type="obsolete">解碼器選項(&amp;D)...</translation>
+ <location line="+244"/>
+ <source>&amp;Close</source>
+ <translation>&amp;關閉</translation>
 </message>
 <message>
- <source>Decoder Options</source>
- <translation type="obsolete">解碼器選項</translation>
+ <location line="-305"/>
+ <source>Video Filter Manager</source>
+ <translation>影片濾鏡管理器</translation>
 </message>
 <message>
- <source>F3</source>
- <translation type="obsolete">F3</translation>
+ <location line="+198"/>
+ <source>Colors</source>
+ <translation>色彩-特效</translation>
 </message>
 <message>
- <source>&amp;Postprocessing...</source>
- <translation type="obsolete">後置處理(&amp;P)...</translation>
+ <location line="+36"/>
+ <source>OpenGl</source>
+ <translation>OpenGl</translation>
 </message>
 <message>
- <source>F4</source>
- <translation type="obsolete">F4</translation>
+ <location line="+9"/>
+ <source>Miscellaneous</source>
+ <translation>雜項</translation>
 </message>
 <message>
- <source>&amp;Frame Rate...</source>
- <translation type="obsolete">畫格率(&amp;F)...</translation>
+ <location line="+51"/>
+ <source>&amp;Preview</source>
+ <translation>&amp;預覽</translation>
 </message>
 <message>
- <source>Frame Rate</source>
- <translation type="obsolete">畫格率</translation>
+ <location line="-114"/>
+ <source>Transform</source>
+ <translation>變形(轉型)</translation>
 </message>
 <message>
- <source>Fil&amp;ters...</source>
- <translation type="obsolete">濾鏡(&amp;T)...</translation>
+ <location line="+36"/>
+ <source>Sharpness</source>
+ <translation>銳利-特效</translation>
 </message>
 <message>
- <source>Ctrl+Alt+F</source>
- <translation type="obsolete">Ctrl+Alt+F</translation>
+ <location line="-27"/>
+ <source>Interlacing</source>
+ <translation>交錯(隔行)掃描</translation>
 </message>
 <message>
- <source>&amp;Main Track...</source>
- <translation type="obsolete">主音軌(&amp;M)...</translation>
+ <location line="+36"/>
+ <source>Subtitles</source>
+ <translation>字幕-匯入文字檔</translation>
 </message>
 <message>
- <source>&amp;Secondary Track...</source>
- <translation type="obsolete">第二音軌(&amp;S)...</translation>
+ <location line="-86"/>
+ <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
+ <translation>&lt;big&gt;&lt;b&gt;可選用的濾鏡器&lt;/b&gt;&lt;/big&gt;</translation>
 </message>
+</context>
+<context>
+ <name>matroskademuxer</name>
 <message>
- <source>Build VBR Time Map</source>
- <translation type="obsolete">建立 VBR 時間對應</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+474"/>
+ <source>Matroska clusters</source>
+ <translation>Matroska 集群</translation>
 </message>
 <message>
- <source>S&amp;ave...</source>
- <translation type="obsolete">儲存(&amp;A)...</translation>
+ <location line="-426"/>
+ <source>Matroska Images</source>
+ <translation>Matroska 圖像</translation>
 </message>
+</context>
+<context>
+ <name>mcdeint</name>
 <message>
- <location line="+81"/>
- <source>Ctrl+Alt+S</source>
- <translation type="unfinished">Ctrl+Alt+S</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+120"/>
+ <source>Fast</source>
+ <translation>快</translation>
 </message>
 <message>
- <source>&amp;Filters</source>
- <translation type="obsolete">濾鏡(&amp;F)</translation>
+ <location line="+8"/>
+ <source>_Qp:</source>
+ <translation>_Qp:</translation>
 </message>
 <message>
- <location line="-72"/>
- <source>&amp;Calculator...</source>
- <translation type="unfinished">計算機(&amp;C)...</translation>
+ <location line="-47"/>
+ <source>MCDeint</source>
+ <translation>MC去交錯</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>F7</source>
- <translation type="unfinished">F7</translation>
+ <location line="+42"/>
+ <source>Extra slow (same as 3+multiple reference frames)</source>
+ <translation>特別慢 (同於3或3倍數以上的參考幀數)</translation>
 </message>
 <message>
- <source>&amp;Rebuild I &amp;&amp; B Frames</source>
- <translation type="obsolete">重建 I &amp;&amp; B 畫格(&amp;R)</translation>
+ <location line="-1"/>
+ <source>Slow iterative motion search</source>
+ <translation>緩慢反覆的運動搜尋</translation>
 </message>
 <message>
- <source>Rebuild I &amp; B Frames</source>
- <translation type="obsolete">重建 I &amp; B 畫格</translation>
+ <location line="-1"/>
+ <source>Medium</source>
+ <translation>中</translation>
 </message>
 <message>
- <source>&amp;Bitrate Histogram...</source>
- <translation type="obsolete">位元率分佈圖(&amp;B)...</translation>
+ <location line="+5"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
 </message>
 <message>
- <source>Bitrate Histogram</source>
- <translation type="obsolete">位元率分佈圖</translation>
+ <location line="+1"/>
+ <source>Bottom :</source>
+ <translation>底部 :</translation>
 </message>
 <message>
- <source>&amp;Scan for Black Frames...</source>
- <translation type="obsolete">掃描黑畫面(&amp;S)...</translation>
+ <location line="+5"/>
+ <source>mcDeinterlace</source>
+ <translation>mc去交錯</translation>
 </message>
 <message>
- <source>Scan for Black Frames</source>
- <translation type="obsolete">掃描黑畫面</translation>
+ <location line="-50"/>
+ <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
+ <translation>從 MPlayer 移植的運動補償去交錯器。</translation>
 </message>
+</context>
+<context>
+ <name>mean</name>
 <message>
- <source>&amp;VOB -&gt; VobSub...</source>
- <translation type="obsolete">&amp;VOB 轉成 VobSub...</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
+ <source>Mean convolution.</source>
+ <translation>4.1-Mean 卷積(3x3)矩陣-明度色度。</translation>
 </message>
 <message>
- <source>VOB -&gt; VobSub</source>
- <translation type="obsolete">VOB 轉成 VobSub</translation>
+ <location line="+1"/>
+ <source>3x3 convolution filter :mean.</source>
+ <translation>3 x 3 卷積濾鏡：mean(convolution)</translation>
 </message>
+</context>
+<context>
+ <name>median</name>
 <message>
- <source>&amp;OCR (VobSub -&gt; srt)...</source>
- <translation type="obsolete">&amp;OCR (VobSub 轉成 srt)...</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+29"/>
+ <source>3x3 convolution filter :median.</source>
+ <translation>3 x 3 卷積濾鏡： 中位數。</translation>
 </message>
 <message>
- <source>OCR (VobSub -&gt; srt)</source>
- <translation type="obsolete">OCR (VobSub 轉成 srt)</translation>
+ <location line="-1"/>
+ <source>Median convolution.</source>
+ <translation>4.1-中位數卷積(3x3)矩陣-明度色度。</translation>
 </message>
+</context>
+<context>
+ <name>mergeFields</name>
 <message>
- <source>P</source>
- <translation type="obsolete">P</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
+ <source>Merge Fields</source>
+ <translation>2.7-影片合併掃描場左右擠壓，畫面在垂直中帶</translation>
 </message>
 <message>
- <source>P&amp;revious Frame</source>
- <translation type="obsolete">上一畫格(&amp;R)</translation>
+ <location line="+1"/>
+ <source>Merge two pictures as if they were two fields.</source>
+ <translation>圖像和雙垂直解析度減半。</translation>
 </message>
+</context>
+<context>
+ <name>mkvmuxer</name>
 <message>
- <source>Left</source>
- <translation type="obsolete">←</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+168"/>
+ <source>Saving Mkv</source>
+ <translation>儲存 Mkv中</translation>
 </message>
 <message>
- <source>&amp;Next Frame</source>
- <translation type="obsolete">下一畫格(&amp;N)</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+30"/>
+ <source>Display width</source>
+ <translation>顯示寬度</translation>
 </message>
 <message>
- <source>Right</source>
- <translation type="obsolete">→</translation>
+ <location line="-1"/>
+ <source>Force display width</source>
+ <translation>限制顯示寬度</translation>
 </message>
 <message>
- <source>Pr&amp;evious Intra Frame</source>
- <translation type="obsolete">上一內部畫格(&amp;E)</translation>
+ <location line="+3"/>
+ <source>Force Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Previous Intra Frame</source>
- <translation type="obsolete">上一個內部畫格</translation>
+ <location line="+7"/>
+ <source>MKV Muxer</source>
+ <translation>MKV 複合器</translation>
 </message>
+</context>
+<context>
+ <name>mp3d</name>
 <message>
- <source>Down</source>
- <translation type="obsolete">↓</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+237"/>
+ <source>T_emporal chroma strength:</source>
+ <translation>時_間色度強度：</translation>
 </message>
 <message>
- <source>Next &amp;Intra Frame</source>
- <translation type="obsolete">下一內部畫格(&amp;I)</translation>
+ <location line="-35"/>
+ <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+ <translation>降低雜訊、平滑圖像、增加可壓縮性，HQ的版本。</translation>
 </message>
 <message>
- <source>Next Intra Frame</source>
- <translation type="obsolete">上一個內部畫格</translation>
+ <location line="+33"/>
+ <source>S_patial chroma strength:</source>
+ <translation>空_間的色度強度:</translation>
 </message>
 <message>
- <source>Up</source>
- <translation type="obsolete">↑</translation>
+ <location line="+1"/>
+ <source>_Temporal luma strength:</source>
+ <translation>_時間明度強度：</translation>
 </message>
 <message>
- <source>Previou&amp;s Black Frame</source>
- <translation type="obsolete">上一黑畫面(&amp;S)</translation>
+ <location line="-2"/>
+ <source>_Spatial luma strength:</source>
+ <translation>_空間的明度強度:</translation>
 </message>
 <message>
- <source>Previous Black Frame</source>
- <translation type="obsolete">上一個黑畫面</translation>
+ <location line="+7"/>
+ <source>MPlayer Denoise 3D HQ</source>
+ <translation>4.2-MPlayer高精度品質時空去雜訊3D HQ</translation>
 </message>
 <message>
- <source>Ne&amp;xt Black Frame</source>
- <translation type="obsolete">下一黑畫面(&amp;X)</translation>
+ <location line="-40"/>
+ <source>Mplayer Denoise 3D HQ</source>
+ <translation>4.2-MPlayer高精度品質時空去雜訊3D HQ</translation>
 </message>
+</context>
+<context>
+ <name>mp3dlow</name>
 <message>
- <source>Next Black Frame</source>
- <translation type="obsolete">下一個黑畫面</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="+70"/>
+ <source>S_patial chroma strength:</source>
+ <translation>空_間的色度強度:</translation>
 </message>
 <message>
- <source>&amp;First Frame</source>
- <translation type="obsolete">起始畫格(&amp;F)</translation>
+ <location line="+1"/>
+ <source>_Temporal strength:</source>
+ <translation>_時間強度:</translation>
 </message>
 <message>
- <source>Home</source>
- <translation type="obsolete">Home</translation>
+ <location line="-2"/>
+ <source>_Spatial luma strength:</source>
+ <translation>_空間的明度強度:</translation>
 </message>
 <message>
- <source>&amp;Last Frame</source>
- <translation type="obsolete">最後畫格(&amp;L)</translation>
+ <location line="-33"/>
+ <source>Mplayer Denoise 3D</source>
+ <translation>4.2-MPlayer時空去雜訊3D</translation>
 </message>
 <message>
- <source>End</source>
- <translation type="obsolete">End</translation>
+ <location line="+1"/>
+ <source>Reduce noise, smooth image, increase compressibility.</source>
+ <translation>減少雜訊、平滑圖像、增加壓縮率。</translation>
 </message>
 <message>
- <source>Jump to Marker &amp;A</source>
- <translation type="obsolete">跳至標記 &amp;A</translation>
+ <location line="+38"/>
+ <source>MPlayer Denoise 3D</source>
+ <translation>4.2-MPlayer時空去雜訊3D</translation>
 </message>
+</context>
+<context>
+ <name>mp4demuxer</name>
 <message>
- <source>Jump to Marker A</source>
- <translation type="obsolete">跳至標記 A</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+815"/>
+ <source>Problem reading SVQ3 headers</source>
+ <translation>讀取 SVQ3 檔頭時發生問題</translation>
 </message>
+</context>
+<context>
+ <name>mp4muxer</name>
 <message>
- <source>Ctrl+[</source>
- <translation type="obsolete">Ctrl+[</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+29"/>
+ <source>Muxing Format</source>
+ <translation>複合器格式</translation>
 </message>
 <message>
- <source>Jump to Marker &amp;B</source>
- <translation type="obsolete">跳至標記 &amp;B</translation>
+ <location line="+2"/>
+ <source>Force aspect ratio</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Jump to Marker B</source>
- <translation type="obsolete">跳至標記 B</translation>
+ <location line="+2"/>
+ <source>Aspect Ratio (DAR)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Ctrl+]</source>
- <translation type="obsolete">Ctrl+]</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+188"/>
+ <source>Saving PSP</source>
+ <translation>儲存 PSP</translation>
 </message>
 <message>
- <source>Jump to Fra&amp;me...</source>
- <translation type="obsolete">跳至畫格(&amp;M)...</translation>
+ <location line="-1"/>
+ <source>Saving mp4</source>
+ <translation>儲存 mp4</translation>
 </message>
 <message>
- <source>Ctrl+F</source>
- <translation type="obsolete">Ctrl+F</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="-3"/>
+ <source>Use alternate MP3 tag</source>
+ <translation>使用備用的 MP3 標記</translation>
 </message>
 <message>
- <source>Jump to &amp;Time...</source>
- <translation type="obsolete">跳至時間(&amp;T)...</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-121"/>
+ <source>Only MP4Video, H264, and H265 supported for video</source>
+ <translation>唯一的 MP4影片， H264、H265、ASP(ff)、ASP(xvid4) 支援影片編碼</translation>
 </message>
 <message>
- <source>Ctrl+T</source>
- <translation type="obsolete">Ctrl+T</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+6"/>
+ <source>MP4 Muxer</source>
+ <translatorcomment>Force aspect ratio &amp; DAR NO Display</translatorcomment>
+ <translation type="unfinished">強制PA&amp;不顯示</translation>
 </message>
 <message>
- <source>&amp;Built-in Support...</source>
- <translation type="obsolete">內建的支援(&amp;B)...</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+0"/>
+ <location line="+9"/>
+ <source>Unsupported</source>
+ <translation>未支援的</translation>
 </message>
 <message>
- <source>Built-in Support</source>
- <translation type="obsolete">內建的支援</translation>
+ <location line="+0"/>
+ <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+ <translation>只有 AAC、 AC3、 E AC3 和mpeg音訊支援音訊</translation>
 </message>
+</context>
+<context>
+ <name>mp4v2muxer</name>
 <message>
- <source>&amp;About Avidemux...</source>
- <translation type="obsolete">關於 &amp;Avidemux...</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+ <source>Audio</source>
+ <translation>音訊</translation>
 </message>
 <message>
- <source>About Avidemux</source>
- <translation type="obsolete">關於 Avidemux</translation>
+ <location line="+60"/>
+ <source>Video</source>
+ <translation>影片</translation>
 </message>
 <message>
- <source>&amp;Play/Stop</source>
- <translation type="obsolete">播放/停止(&amp;P)</translation>
+ <location line="-60"/>
+ <source>Audio format not supported, only AAC/MP3/AC3</source>
+ <translation>音訊格式不受支援，只有 AAC/MP3/AC3</translation>
 </message>
 <message>
- <source>Play/Stop</source>
- <translation type="obsolete">播放/停止</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+133"/>
+ <source>Cannot get AAC Extra data
+</source>
+ <translation>不能獲取 AAC 額外資料</translation>
 </message>
 <message>
- <source>Recent0</source>
- <translation type="obsolete">最近開啟的檔案0</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+46"/>
+ <source>Saving</source>
+ <translation>儲存中</translation>
 </message>
 <message>
- <source>Recent1</source>
- <translation type="obsolete">最近開啟的檔案1</translation>
+ <location line="+14"/>
+ <source>Video does not have enough timing information. Are you copying from AVI?</source>
+ <translation>影片沒有足夠的時間資訊。你將從 AVI 複製嗎？</translation>
 </message>
 <message>
- <source>Recent2</source>
- <translation type="obsolete">最近開啟的檔案2</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="-61"/>
+ <source>Invalid bitrate for AC3</source>
+ <translation>AC3不正確位元速率</translation>
 </message>
 <message>
- <source>Recent3</source>
- <translation type="obsolete">最近開啟的檔案3</translation>
+ <location line="-19"/>
+ <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
+ <translation>無效的頻率AC3只有 32, 44.1 &amp; 48 kHz</translation>
 </message>
 <message>
- <source>Add to &amp;Joblist...</source>
- <translation type="obsolete">新增至工作列表(&amp;J)...</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+65"/>
+ <source>Cannot rename file (optimize)</source>
+ <translation>無法重命名檔（優化）</translation>
 </message>
 <message>
- <source>Add to Joblist</source>
- <translation type="obsolete">新增至工作列表</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+32"/>
+ <source>Invalid number of channels for AC3</source>
+ <translation>AC3 音訊的數目無效</translation>
 </message>
 <message>
- <source>View &amp;Joblist...</source>
- <translation type="obsolete">檢視工作列表(&amp;J)...</translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
+ <source>Optimize for streaming (SLOW)</source>
+ <translation>優化的音訊（慢）</translation>
 </message>
 <message>
- <source>View Joblist</source>
- <translation type="obsolete">檢視工作列表</translation>
+ <location line="+1"/>
+ <source>Add ipod metadata</source>
+ <translation>增加 ipod 元數據</translation>
 </message>
 <message>
- <source>Ctrl+J</source>
- <translation type="obsolete">Ctrl+J</translation>
+ <location line="+4"/>
+ <source>MP4V2 Settings</source>
+ <translation>MP4V2 設定</translation>
 </message>
+</context>
+<context>
+ <name>mpdelogoDialog</name>
 <message>
- <source>Co&amp;nnect to avsproxy</source>
- <translation type="obsolete">連線至 avsproxy(&amp;N)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+22"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+46"/>
+ <source>X</source>
+ <translation>X</translation>
 </message>
 <message>
- <source>Connect to avsproxy</source>
- <translation type="obsolete">連線至 avsproxy</translation>
+ <location line="+20"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+37"/>
+ <source>Y</source>
+ <translation>Y</translation>
 </message>
 <message>
- <source>&amp;Reset Edits</source>
- <translation type="obsolete">回復編輯(&amp;R)</translation>
+ <location line="+23"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-17"/>
+ <source>Width</source>
+ <translation>寬</translation>
 </message>
 <message>
- <source>OCR (&amp;TS -&gt; srt)...</source>
- <translation type="obsolete">OCR (&amp;TS 轉成 srt)...</translation>
+ <location line="+40"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-7"/>
+ <source>Border Width</source>
+ <translation>邊框寬度</translation>
 </message>
 <message>
- <source>OCR (TS -&gt; srt)</source>
- <translation type="obsolete">OCR (TS 轉成 srt)</translation>
+ <location line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-45"/>
+ <source>Mplayer Delogo</source>
+ <translation>5.1-去標誌(MPlayer delogo)</translation>
 </message>
 <message>
- <source>Edit &amp;Glyphs...</source>
- <translation type="obsolete">編輯字形(&amp;G)...</translation>
+ <location line="+71"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+59"/>
+ <source>Height</source>
+ <translation>高</translation>
 </message>
 <message>
- <source>Edit Glyphs</source>
- <translation type="obsolete">編輯字形</translation>
+ <location line="+70"/>
+ <source>Preview. Click in the image above to coarsly set the box coordinates</source>
+ <translation>預覽，在上述粗設置框座標圖像中按一下游標</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>&amp;Input</source>
- <translation type="unfinished">輸入(&amp;I)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+103"/>
+ <source>Preview</source>
+ <translation>預覽</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>&amp;Output</source>
- <translation type="unfinished">輸出(&amp;O)</translation>
+ <location line="-58"/>
+ <source>You can resize the red rectangle using the grips </source>
+ <translation>你可以調整大小使用支配的紅色矩形</translation>
 </message>
+</context>
+<context>
+ <name>msharpen</name>
 <message>
- <location line="+106"/>
- <source>Si&amp;de</source>
- <translation type="unfinished">左右並排(&amp;D)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
+ <source>Msharpen</source>
+ <translation>5.2-運動銳化(Msharpen)</translation>
 </message>
 <message>
- <location line="-12"/>
- <source>&amp;Top</source>
- <translation type="unfinished">上下並排(&amp;T)</translation>
+ <location line="+1"/>
+ <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
+ <translation>沒有放大雜訊下銳利化邊緣。作者為 唐納德(Donald Graft)。</translation>
 </message>
+</context>
+<context>
+ <name>msharpenDialog</name>
 <message>
- <location line="-12"/>
- <source>&amp;Separate</source>
- <translation type="unfinished">分離視窗(&amp;S)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+77"/>
+ <source>Mask</source>
+ <translation>遮罩</translation>
 </message>
 <message>
- <source>&amp;Close</source>
- <translation type="obsolete">關閉(&amp;C)</translation>
+ <location line="+47"/>
+ <source>Threshold</source>
+ <translation>界限值</translation>
 </message>
 <message>
- <source>Ctrl+W</source>
- <translation type="obsolete">Ctrl+W</translation>
+ <location line="+10"/>
+ <source>HighQuality</source>
+ <translation>高品質</translation>
 </message>
 <message>
- <source>Save Selection as JPEG Images...</source>
- <translation type="obsolete">選取另存為 JPEG 圖像...</translation>
+ <location line="-120"/>
+ <source>MSharpen</source>
+ <translation>5.2-運動銳化(Msharpen)</translation>
 </message>
 <message>
- <source>&amp;Preferences...</source>
- <translation type="obsolete">偏好設定(&amp;P)...</translation>
+ <location line="+100"/>
+ <source>Strength</source>
+ <translation>強度</translation>
 </message>
+</context>
+<context>
+ <name>navigate</name>
 <message>
- <source>&amp;Plugins...</source>
- <translation type="obsolete">外掛模組(&amp;P)...</translation>
+ <location filename="../../common/gui_navigate.cpp" line="+501"/>
+ <source>Seek</source>
+ <translation>尋求</translation>
 </message>
 <message>
- <source>DVD</source>
- <translation type="obsolete">DVD</translation>
+ <location line="+78"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <location line="-504"/>
- <source>Frame type:</source>
- <translation type="unfinished">畫格類型:</translation>
+ <location line="-266"/>
+ <source>Cannot go to previous keyframe</source>
+ <translation>轉到上一幀(關鍵幀或I幀)</translation>
 </message>
 <message>
- <location line="-1244"/>
- <source>&amp;Toolbars</source>
- <translation type="unfinished"></translation>
+ <location line="-69"/>
+ <source>Cannot go to next keyframe</source>
+ <translation>轉到下一幀(關鍵幀或I幀)</translation>
 </message>
+</context>
+<context>
+ <name>nvenc</name>
 <message>
- <location line="+12"/>
- <source>&amp;Auto</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+154"/>
+ <source>Nvidia H264 Encoder configuration</source>
+ <translation>Nvidia H264 編碼器配置</translation>
 </message>
 <message>
- <location line="+30"/>
- <source>&amp;Recent</source>
- <translation type="unfinished"></translation>
+ <location line="-15"/>
+ <source>Low Latency</source>
+ <translation>低延遲</translation>
 </message>
 <message>
- <location line="+44"/>
- <source>Codec O&amp;ptions</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>BluRay</source>
+ <translation>BluRay藍光</translation>
 </message>
 <message>
- <location line="+108"/>
- <location line="+7"/>
- <source>XXXX</source>
- <translation type="unfinished"></translation>
+ <location line="+11"/>
+ <source>Bitrate (kbps):</source>
+ <translation>位元速率 (kbps):</translation>
 </message>
 <message>
- <location line="+57"/>
- <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <location line="+1"/>
+ <source>Max Bitrate (kbps):</source>
+ <translation>最大位元率 (kbps):</translation>
 </message>
 <message>
- <location line="+176"/>
- <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <location line="-2"/>
+ <source>Preset:</source>
+ <translation>預設定 :</translation>
 </message>
 <message>
- <location line="+10"/>
- <source> (0 track(s))</source>
- <translation type="unfinished"></translation>
+ <location line="-12"/>
+ <source>Low Quality</source>
+ <translation>低品質</translation>
 </message>
 <message>
- <location line="+196"/>
- <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
+ <location line="+1"/>
+ <source>High Quality</source>
+ <translation>高品質</translation>
 </message>
 <message>
- <location line="+114"/>
- <location line="+937"/>
- <source>&amp;Navigation</source>
- <translation type="unfinished"></translation>
+ <location line="+4"/>
+ <source>Low Latency (HQ)</source>
+ <translation>低延遲 (HQ)</translation>
 </message>
 <message>
- <location line="-862"/>
- <source>Play [SPACE]</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>Low Latency (LQ)</source>
+ <translation>低延遲 (LQ)</translation>
 </message>
+</context>
+<context>
+ <name>opendmldemuxer</name>
 <message>
- <location line="+3"/>
- <source>Play</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+ <location line="+76"/>
+ <location line="+268"/>
+ <source>Malformed header</source>
+ <translation>不正常的標頭</translation>
 </message>
 <message>
- <location line="+26"/>
- <source>Go to previous frame [LEFT]</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+ <source>Unpacking bitstream</source>
+ <translation>解壓位元流</translation>
 </message>
+</context>
+<context>
+ <name>partial</name>
 <message>
- <location line="+23"/>
- <source>Go to next frame [RIGHT]</source>
- <translation type="unfinished"></translation>
+ <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+344"/>
+ <source>_End time:</source>
+ <translation>結束時間:</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Go to previous keyframe [DOWN]</source>
- <translation type="unfinished"></translation>
+ <location line="+1"/>
+ <source>Configure filter</source>
+ <translation>配置濾鏡器</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Go to next keyframe [UP]</source>
- <translation type="unfinished"></translation>
+ <location line="+3"/>
+ <source>Partial Filter</source>
+ <translation>局部濾鏡器</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Set start marker [CTRL+PAGEUP]</source>
- <translation type="unfinished"></translation>
+ <location line="-5"/>
+ <source>_Start time:</source>
+ <translation>開始時間:</translation>
 </message>
+</context>
+<context>
+ <name>printinfo</name>
 <message>
- <location line="+23"/>
- <source>Set end marker [CTRL+PAGEDOWN]</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
+ <source>PrintInfo</source>
+ <translation>8.2-列印資訊</translation>
 </message>
 <message>
- <location line="+26"/>
- <source>Search previous black frame</source>
- <translation type="unfinished"></translation>
+ <location line="+1"/>
+ <source>Display some informations on Screen.</source>
+ <translation>顯示一些資訊在螢幕上</translation>
 </message>
+</context>
+<context>
+ <name>propsDialog</name>
 <message>
- <location line="+23"/>
- <source>Search next black frame</source>
- <translation type="unfinished"></translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+311"/>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Go to first frame [HOME]</source>
- <translation type="unfinished"></translation>
+ <location line="-142"/>
+ <source>Audio</source>
+ <translation>音訊</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Go to last frame [END]</source>
- <translation type="unfinished"></translation>
+ <location line="-149"/>
+ <source>Video</source>
+ <translation>影片</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Backward one minute [CTRL+DOWN]</source>
- <translation type="unfinished"></translation>
+ <location line="+222"/>
+ <source>Bitrate:</source>
+ <translation>位元率:</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Forward one minute [CTRL+UP]</source>
- <translation type="unfinished"></translation>
+ <location line="-83"/>
+ <source>Extra data :</source>
+ <translation>額外的資料</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Forward one minute</source>
- <translation type="unfinished"></translation>
+ <location line="-42"/>
+ <source>Extra Video Properties</source>
+ <translation>額外的影片屬性</translation>
 </message>
 <message>
- <location line="+178"/>
- <source>Se&amp;lection</source>
- <translation type="unfinished"></translation>
+ <location line="-52"/>
+ <location line="+135"/>
+ <source>Total Duration:</source>
+ <translation>總持續時間:</translation>
 </message>
 <message>
- <location line="+87"/>
- <source>Go to marker A [PAGE UP]</source>
- <translation type="unfinished"></translation>
+ <location line="+70"/>
+ <source>Codec:</source>
+ <translation>編解碼器:</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Go to Marker B [PAGE DOWN]</source>
- <translation type="unfinished"></translation>
+ <location line="-125"/>
+ <source>ExtraDataSize:</source>
+ <translation>額外的資料大小：</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Display output video on playback</source>
- <translation type="unfinished"></translation>
+ <location line="-131"/>
+ <source>Properties</source>
+ <translation>屬性</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Play filtered</source>
- <translation type="unfinished"></translation>
+ <location line="+79"/>
+ <source>Image Size:</source>
+ <translation>圖像大小(DAR):</translation>
 </message>
 <message>
- <location line="+25"/>
- <source>Vol&amp;ume</source>
- <translation type="unfinished"></translation>
+ <location line="-42"/>
+ <source>Frame Rate:</source>
+ <translation>幀率:</translation>
 </message>
 <message>
- <location line="+89"/>
- <source>Audio &amp;Metre</source>
- <translation type="unfinished"></translation>
+ <location line="+170"/>
+ <source>Variable Bitrate:</source>
+ <translation>可變位元率(VBR):</translation>
 </message>
 <message>
- <location line="+44"/>
- <source>Open Video</source>
- <translation type="unfinished"></translation>
+ <location line="+61"/>
+ <source>Copy to Clipboard</source>
+ <translation>複製到剪貼簿</translation>
 </message>
 <message>
- <location line="+107"/>
- <source>&amp;Codec Options</source>
- <translation type="unfinished"></translation>
+ <location line="-26"/>
+ <source>Channels:</source>
+ <translation>聲道:</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Ctrl+Alt+C</source>
- <translation type="unfinished"></translation>
+ <location line="-49"/>
+ <source>Frequency:</source>
+ <translation>頻率:</translation>
 </message>
 <message>
- <location line="+14"/>
- <source>Ctrl+Alt+N</source>
- <translation type="unfinished"></translation>
+ <location line="-100"/>
+ <source>Codec 4CC:</source>
+ <translation>編解碼器 4CC:</translation>
 </message>
 <message>
- <location line="+11"/>
- <source>&amp;Selection</source>
- <translation type="unfinished"></translation>
+ <location line="-28"/>
+ <source>Aspect Ratio:</source>
+ <translation>像素比例(PAR):</translation>
 </message>
 <message>
+ <location line="-35"/>
 <location line="+14"/>
- <source>&amp;Volume</source>
- <translation type="unfinished"></translation>
+ <location line="+14"/>
+ <location line="+14"/>
+ <location line="+14"/>
+ <source>TextLabel</source>
+ <translation>文字標籤</translation>
 </message>
+</context>
+<context>
+ <name>psdemuxer</name>
 <message>
- <location line="+3"/>
- <source>Ctrl+Alt+V</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+60"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <location line="+11"/>
- <source>&amp;Audio Metre</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+ <source>Indexing</source>
+ <translation>正在索引</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Ctrl+Alt+M</source>
- <translation type="unfinished"></translation>
+ <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>
 </message>
-</context>
-<context>
- <name>MjpegEncoder</name>
 <message>
- <source>Settings</source>
- <translation type="obsolete">設定</translation>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+41"/>
+ <source>There are several files with sequential file names. Should they be all loaded ?</source>
+ <translation>有幾個檔使用順序檔案名稱，所有載入他們嗎？</translation>
 </message>
 </context>
 <context>
- <name>Mpeg1Encoder</name>
+ <name>qaudiotracks</name>
 <message>
- <source>4:3</source>
- <translation type="obsolete">4:3</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+510"/>
+ <source>copy</source>
+ <translation>複製</translation>
 </message>
 <message>
- <source>16:9</source>
- <translation type="obsolete">16:9</translation>
+ <location line="-354"/>
+ <location line="+152"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <source>Default</source>
- <translation type="obsolete">預設</translation>
+ <location line="+134"/>
+ <source>File </source>
+ <translation>檔案 </translation>
+ </message>
+ <message>
+ <location line="-134"/>
+ <source>Some tracks are used multiple times</source>
+ <translation>一些軌道使用多次</translation>
 </message>
 <message>
- <source>TMPGEnc</source>
- <translation type="obsolete">TMPGEnc</translation>
+ <location line="+126"/>
+ <source>Track </source>
+ <translation>軌 </translation>
 </message>
 <message>
- <source>Anime</source>
- <translation type="obsolete">動畫</translation>
+ <location line="+42"/>
+ <source>.... Add audio track</source>
+ <translation>....增加音訊軌</translation>
 </message>
 <message>
- <source>KVCD</source>
- <translation type="obsolete">KVCD</translation>
+ <location line="-342"/>
+ <source>Select audio file</source>
+ <translation>將選擇音訊檔案</translation>
 </message>
 <message>
- <source>Progressive</source>
- <translation type="obsolete">漸進的</translation>
+ <location line="+22"/>
+ <source>Cannot use that file as audio track</source>
+ <translation>不能使用該檔作為音訊軌道</translation>
+ </message>
+ <message>
+ <location line="+278"/>
+ <source> from video</source>
+ <translation>來至影片</translation>
 </message>
+</context>
+<context>
+ <name>qencoding</name>
 <message>
- <source>Interlaced BFF</source>
- <translation type="obsolete">交錯的 BFF</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+378"/>
+ <source>Abort</source>
+ <translation>中止</translation>
 </message>
 <message>
- <source>Interlaced TFF</source>
- <translation type="obsolete">交錯的 TFF</translation>
+ <location line="-313"/>
+ <location line="+20"/>
+ <source>Privileges Required</source>
+ <translation>需要特殊權限</translation>
 </message>
 <message>
- <source>Ma_x. bitrate:</source>
- <translation type="obsolete">最大位元率(_X):</translation>
+ <location line="+101"/>
+ <source>Pass 1</source>
+ <translation>通過 1</translation>
 </message>
 <message>
- <source>Mi_n. bitrate:</source>
- <translation type="obsolete">最小位元率(_N):</translation>
+ <location line="+192"/>
+ <source>Resume</source>
+ <translation>繼續</translation>
 </message>
 <message>
- <source>_Use Xvid rate control</source>
- <translation type="obsolete">使用 Xvid 比率控制(_U)</translation>
+ <location line="-313"/>
+ <location line="+20"/>
+ <source>Root privileges are required to perform this operation.</source>
+ <translation>需要 Root 權限來實行這項操作。</translation>
 </message>
 <message>
- <source>_Buffer size:</source>
- <translation type="obsolete">緩衝大小(_B):</translation>
+ <location line="+100"/>
+ <source>First Pass</source>
+ <translation>快速第1通</translation>
 </message>
 <message>
- <source>Aspect _ratio:</source>
- <translation type="obsolete">外觀比例(_R):</translation>
+ <location line="+4"/>
+ <source>Encoding...</source>
+ <translation>編碼中..</translation>
 </message>
 <message>
- <source>_Matrices:</source>
- <translation type="obsolete">矩陣(_M):</translation>
+ <location line="+188"/>
+ <source>The encoding is paused. Do you want to resume or abort?</source>
+ <translation>編碼已經暫停。您要繼續或中止?</translation>
 </message>
+</context>
+<context>
+ <name>qfile</name>
 <message>
- <source>_GOP size:</source>
- <translation type="obsolete">_GOP 大小:</translation>
+ <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+135"/>
+ <location line="+96"/>
+ <source> files (*.</source>
+ <translation> 檔案 (*.</translation>
 </message>
 <message>
- <source>_Interlacing:</source>
- <translation type="obsolete">交錯(_I):</translation>
+ <location line="-181"/>
+ <location line="+139"/>
+ <source>All files (*.*)</source>
+ <translation>所有檔案 (*.*)</translation>
 </message>
 <message>
- <source>Settings</source>
- <translation type="obsolete">設定</translation>
+ <location line="-26"/>
+ <source>Overwrite file </source>
+ <translation>覆寫檔案</translation>
 </message>
 </context>
 <context>
- <name>Mpeg2Encoder</name>
+ <name>qgui2</name>
 <message>
- <source>4:3</source>
- <translation type="obsolete">4:3</translation>
+ <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2033"/>
+ <source>%c-%s (%02d)</source>
+ <translation>%c-%s (%02d)</translation>
 </message>
 <message>
- <source>16:9</source>
- <translation type="obsolete">16:9</translation>
+ <location line="-915"/>
+ <source>Set start marker</source>
+ <translation>設定開始標記</translation>
 </message>
 <message>
- <source>Default</source>
- <translation type="obsolete">預設</translation>
+ <location line="-907"/>
+ <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>
+ <message>
+ <location line="+246"/>
+ <source>Recent Projects</source>
+ <translation>最近使用的 專案</translation>
 </message>
 <message>
- <source>TMPGEnc</source>
- <translation type="obsolete">TMPGEnc</translation>
+ <location line="+655"/>
+ <source>Go to previous keyframe</source>
+ <translation>轉到上一幀(關鍵幀或I幀)</translation>
 </message>
 <message>
- <source>Anime</source>
- <translation type="obsolete">動畫</translation>
+ <location line="-656"/>
+ <source>Recent Files</source>
+ <translation>最近使用的 檔案</translation>
 </message>
 <message>
- <source>KVCD</source>
- <translation type="obsolete">KVCD</translation>
+ <location line="+659"/>
+ <source>Go to next keyframe</source>
+ <translation>轉到下一幀(關鍵幀或I幀)</translation>
 </message>
 <message>
- <source>Progressive</source>
- <translation type="obsolete">漸進的</translation>
+ <location line="+36"/>
+ <source>Backward one minute</source>
+ <translation>倒退一分鐘</translation>
 </message>
 <message>
- <source>Interlaced BFF</source>
- <translation type="obsolete">交錯的 BFF</translation>
+ <location line="-25"/>
+ <source>Go to first frame</source>
+ <translation>轉到第一幀</translation>
 </message>
 <message>
- <source>Interlaced TFF</source>
- <translation type="obsolete">交錯的 TFF</translation>
+ <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="vanished">&lt;b&gt;有效新版本&lt;/b&gt;&lt;br&gt; 版本 %1&lt;br&gt;
+ 上發行 %2.&lt;br&gt;在這裡你能下載它&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;
+ %3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; 您可以啟用自動更新在選項。&lt;
+ /small&gt;</translation>
 </message>
 <message>
- <source>Ma_x. bitrate:</source>
- <translation type="obsolete">最大位元率(_X):</translation>
+ <location line="-23"/>
+ <source>Play/Stop</source>
+ <translation>播放/停止</translation>
 </message>
 <message>
- <source>Mi_n. bitrate:</source>
- <translation type="obsolete">最小位元率(_N):</translation>
+ <location line="+29"/>
+ <source>Go to marker A</source>
+ <translation>轉到標記A(選擇開始)</translation>
 </message>
 <message>
- <source>_Use Xvid rate control</source>
- <translation type="obsolete">使用 Xvid 比率控制(_U)</translation>
+ <location line="+3"/>
+ <source>Go to marker B</source>
+ <translation>轉到標記B(選擇結束)</translation>
 </message>
 <message>
- <source>_Buffer size:</source>
- <translation type="obsolete">緩衝大小(_B):</translation>
+ <location line="-14"/>
+ <source>Set end marker</source>
+ <translation>設定結束標記</translation>
 </message>
 <message>
- <source>Aspect _ratio:</source>
- <translation type="obsolete">外觀比例(_R):</translation>
+ <location line="+33"/>
+ <source>Forward one minute</source>
+ <translation>前進一分鐘</translation>
 </message>
 <message>
- <source>_Matrices:</source>
- <translation type="obsolete">矩陣(_M):</translation>
+ <location line="-48"/>
+ <source>Go to previous frame</source>
+ <translation>轉到上一幀</translation>
 </message>
 <message>
- <source>_GOP size:</source>
- <translation type="obsolete">_GOP 大小:</translation>
+ <location line="+665"/>
+ <source>The application has encountered a fatal problem
+The current editing has been saved and will be reloaded at next start</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>_Interlacing:</source>
- <translation type="obsolete">交錯(_I):</translation>
+ <location line="+596"/>
+ <source> (%d track(s))</source>
+ <translation> (%d 軌(s))</translation>
 </message>
 <message>
- <source>Settings</source>
- <translation type="obsolete">設定</translation>
+ <location line="-1258"/>
+ <source>Go to next frame</source>
+ <translation>轉到下一幀</translation>
 </message>
 <message>
- <source>DVD</source>
- <translation type="obsolete">DVD</translation>
+ <location line="+20"/>
+ <source>Go to last frame</source>
+ <translation>轉到最後一幀</translation>
 </message>
 </context>
 <context>
- <name>Mpeg4aspEncoder</name>
+ <name>qgui2menu</name>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+91"/>
+ <source>Scripting Shell</source>
+ <translation>腳本殼(Shell)</translation>
 </message>
 <message>
- <source>Full</source>
- <translation type="obsolete">全部</translation>
+ <location line="-20"/>
+ <source>Save &amp;As Project...</source>
+ <translation>儲存 &amp; 另存專案...</translation>
 </message>
 <message>
- <source>Log</source>
- <translation type="obsolete">Log</translation>
+ <location line="+24"/>
+ <source> Shell</source>
+ <translation>殼(Shell)</translation>
 </message>
 <message>
- <source>EPZS</source>
- <translation type="obsolete">EPZS</translation>
+ <location line="-40"/>
+ <source> Project</source>
+ <translation>專案</translation>
 </message>
 <message>
- <source>H.263</source>
- <translation type="obsolete">H.263</translation>
+ <location line="+11"/>
+ <source>&amp;Debug Project...</source>
+ <translation>&amp;除錯專案...</translation>
 </message>
 <message>
- <source>MPEG</source>
- <translation type="obsolete">MPEG</translation>
+ <location line="+51"/>
+ <source>Scripting Reference</source>
+ <translation>參考腳本</translation>
 </message>
 <message>
- <source>Motion Estimation</source>
- <translation type="obsolete">動作估測</translation>
+ <location line="-56"/>
+ <source>&amp;Run Project...</source>
+ <translation>&amp;執行專案...</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source> Reference</source>
+ <translation>參考</translation>
+ </message>
+ <message>
+ <location line="-70"/>
+ <source>Project Script</source>
+ <translation>專案腳本</translation>
 </message>
 </context>
 <context>
- <name>MpegMuxer</name>
+ <name>qjobs</name>
 <message>
- <source>Incompatible audio</source>
- <translation type="obsolete">不相容的音訊</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
+ <source>Ready</source>
+ <translation>準備</translation>
 </message>
 <message>
- <source>For DVD, audio must be MP2 or AC3.</source>
- <translation type="obsolete">DVD 的音訊必須是 MP2 或 AC3。</translation>
+ <location line="+88"/>
+ <location line="+14"/>
+ <source>Sure!</source>
+ <translation>確定!</translation>
 </message>
 <message>
- <source>lvemux init failed</source>
- <translation type="obsolete">lvemux 初始化失敗</translation>
+ <location line="+0"/>
+ <source>Are you sure you want to delete ALL jobs?</source>
+ <translation>確定要刪除所有工作?</translation>
 </message>
-</context>
-<context>
- <name>Msharpen</name>
 <message>
- <source>_Mask</source>
- <translation type="obsolete">遮罩(_M)</translation>
+ <location line="-78"/>
+ <source>End Time</source>
+ <translation>終了時間</translation>
 </message>
 <message>
- <source>_High Q</source>
- <translation type="obsolete">高 Q(_H)</translation>
+ <location line="-24"/>
+ <source>Failed</source>
+ <translation>已失敗</translation>
 </message>
 <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
+ <location line="+24"/>
+ <source>Job Name</source>
+ <translation>工作名稱</translation>
 </message>
 <message>
- <source>_Strength:</source>
- <translation type="obsolete">強度(_S):</translation>
+ <location line="+0"/>
+ <source>Status</source>
+ <translation>狀態</translation>
 </message>
 <message>
- <source>MSharpen</source>
- <translation type="obsolete">MSharpen</translation>
+ <location line="+0"/>
+ <source>Start Time</source>
+ <translation>起始時間</translation>
 </message>
-</context>
-<context>
- <name>Msmooth</name>
 <message>
- <source>_High quality</source>
- <translation type="obsolete">高品質(_H)</translation>
+ <location line="-24"/>
+ <source>Succeeded</source>
+ <translation>已成功</translation>
 </message>
 <message>
- <source>Show _mask</source>
- <translation type="obsolete">顯示遮罩(_M)</translation>
+ <location line="+126"/>
+ <source>This script has already been successfully executed.</source>
+ <translation>這個腳本已經成功執行。</translation>
 </message>
 <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
+ <location line="-126"/>
+ <source>Running</source>
+ <translation>正在執行</translation>
 </message>
 <message>
- <source>_Strength:</source>
- <translation type="obsolete">強度(_S):</translation>
+ <location line="+0"/>
+ <source>Deleted</source>
+ <translation>已刪除</translation>
 </message>
 <message>
- <source>MSmooth</source>
- <translation type="obsolete">MSmooth</translation>
+ <location line="+88"/>
+ <source>Are you sure you want to delete %s job?</source>
+ <translation>確定要刪除 %s 工作?</translation>
 </message>
-</context>
-<context>
- <name>OpenDMLHeader</name>
 <message>
- <source>Malformed header</source>
- <translation type="obsolete">不正常的標頭</translation>
+ <location line="+0"/>
+ <source>Delete job</source>
+ <translation>刪除工作</translation>
 </message>
 <message>
- <source>Unpacking bitstream</source>
- <translation type="obsolete">拆開打包的位元流</translation>
+ <location line="+14"/>
+ <source>Delete *all* job</source>
+ <translation>刪除*所有*工作</translation>
 </message>
 <message>
- <source>Indexing</source>
- <translation type="obsolete">正在索引</translation>
+ <location line="+24"/>
+ <source>Already done</source>
+ <translation>已經完成</translation>
 </message>
 </context>
 <context>
- <name>QObject</name>
+ <name>qlicense</name>
 <message>
- <source>Alert</source>
- <translation type="obsolete">警告</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="+25"/>
+ <source>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux 是自由軟體；您可以遵照自由軟體基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式。&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
 </message>
+</context>
+<context>
+ <name>qmainfilter</name>
 <message>
- <source>Info</source>
- <translation type="obsolete">資訊</translation>
+ <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+680"/>
+ <source>Add</source>
+ <translation>加入</translation>
 </message>
 <message>
- <source>Confirmation</source>
- <translation type="obsolete">答覆</translation>
+ <location line="+145"/>
+ <source>Save video filters..</source>
+ <translation>儲存影片濾鏡器..</translation>
 </message>
 <message>
- <source>Question</source>
- <translation type="obsolete">問題</translation>
+ <location line="-240"/>
+ <source>Make partial</source>
+ <translation>局部</translation>
 </message>
-</context>
-<context>
- <name>SpiderMonkeyShell</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
- <source>Shell</source>
+ <location line="-149"/>
+ <source>This filter cannot be made partial</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+32"/>
- <source>Clear</source>
- <translation type="unfinished"></translation>
+ <location line="+145"/>
+ <source>Move up</source>
+ <translation>向上移動</translation>
 </message>
 <message>
- <location line="+40"/>
- <source>Evaluate</source>
- <translation type="unfinished"></translation>
+ <location line="+2"/>
+ <source>Configure</source>
+ <translation>配置</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Ctrl+Return</source>
- <translation type="unfinished"></translation>
+ <location line="+1"/>
+ <source>Remove</source>
+ <translation>移除</translation>
 </message>
-</context>
-<context>
- <name>Telecide</name>
 <message>
- <source>No strategy</source>
- <translation type="obsolete">無策略</translation>
+ <location line="-148"/>
+ <source>Partial</source>
+ <translation>區段</translation>
 </message>
 <message>
- <source>3:2 pulldown</source>
- <translation type="obsolete">3:2 pulldown</translation>
+ <location line="+146"/>
+ <source>Move down</source>
+ <translation>向下移動</translation>
 </message>
 <message>
- <source>PAL/SECAM</source>
- <translation type="obsolete">PAL/SECAM</translation>
+ <location line="+228"/>
+ <source>Load video filters..</source>
+ <translation>載入影片濾鏡器..</translation>
 </message>
+</context>
+<context>
+ <name>qprocessing</name>
 <message>
- <source>NTSC converted from PAL</source>
- <translation type="obsolete">從 PAL 轉成 NTSC</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+160"/>
+ <source>_Resume</source>
+ <translation>_恢復</translation>
 </message>
 <message>
- <source>Top</source>
- <translation type="obsolete">頂部</translation>
+ <location line="+2"/>
+ <source>Cancel it ?</source>
+ <translation>取消它嗎?</translation>
 </message>
 <message>
- <source>Bottom</source>
- <translation type="obsolete">底部</translation>
+ <location line="-96"/>
+ <source>Unknown</source>
+ <translation>未知</translation>
 </message>
 <message>
- <source>Never</source>
- <translation type="obsolete">絕不</translation>
+ <location line="+95"/>
+ <source>The processing is paused.</source>
+ <translation>程序暫停</translation>
+ </message>
+</context>
+<context>
+ <name>qprops</name>
+ <message>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
+ <source>No</source>
+ <translation>否</translation>
 </message>
 <message>
- <source>If still combed</source>
- <translation type="obsolete">如果仍然有梳形雜訊</translation>
+ <location line="+0"/>
+ <source>Yes</source>
+ <translation>是</translation>
 </message>
 <message>
- <source>Always</source>
- <translation type="obsolete">總是</translation>
+ <location line="+75"/>
+ <source>Mono</source>
+ <translation>單音</translation>
 </message>
 <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
+ <location line="+88"/>
+ <source>Audio</source>
+ <translation>音訊</translation>
 </message>
 <message>
- <source>None but compute</source>
- <translation type="obsolete">無但計算</translation>
+ <location line="-23"/>
+ <source>Video</source>
+ <translation>影片</translation>
 </message>
 <message>
- <source>Postproc on best match</source>
- <translation type="obsolete">在最佳比對上執行後置處理</translation>
+ <location line="+4"/>
+ <source>Image Size:	</source>
+ <translation>圖片大小(DAR):	</translation>
 </message>
 <message>
- <source>Postproc and show zones (debug)</source>
- <translation type="obsolete">後置處理和顯示區域 (除錯)</translation>
+ <location line="+36"/>
+ <source>No Audio</source>
+ <translation>沒音訊</translation>
 </message>
 <message>
- <source>Process image (not fields)</source>
- <translation type="obsolete">處理圖像 (非圖場)</translation>
+ <location line="-32"/>
+ <source>Frame Rate:	</source>
+ <translation>幀率:	</translation>
 </message>
 <message>
- <source>Process image (not fields), debug</source>
- <translation type="obsolete">處理圖像 (非圖場)，除錯</translation>
+ <location line="-116"/>
+ <source>%2.3f fps</source>
+ <translation>%2.3f fps</translation>
 </message>
 <message>
- <source>_Strategy:</source>
- <translation type="obsolete">策略(_S):</translation>
+ <location line="+128"/>
+ <source>Extra data:	</source>
+ <translation> 額外資料：	</translation>
 </message>
 <message>
- <source>_Field order:</source>
- <translation type="obsolete">圖場優先次序(_F):</translation>
+ <location line="-14"/>
+ <source>Aspect Ratio:	</source>
+ <translation>像素比例(PAR)</translation>
 </message>
 <message>
- <source>_Postprocessing:</source>
- <translation type="obsolete">後置處理(_P):</translation>
+ <location line="+6"/>
+ <source>Extra Video Properties</source>
+ <translation>額外影片屬性</translation>
 </message>
 <message>
- <source>_Try backward:</source>
- <translation type="obsolete">嘗試反向(_T):</translation>
+ <location line="-116"/>
+ <location line="+74"/>
+ <source>%02d:%02d:%02d.%03d</source>
+ <translation>%02d:%02d:%02d.%03d</translation>
 </message>
 <message>
- <source>_Direct threshold:</source>
- <translation type="obsolete">正向臨界值(_D):</translation>
+ <location line="+59"/>
+ <source>Channels:	</source>
+ <translation>頻道:	</translation>
 </message>
 <message>
- <source>_Backward threshold:</source>
- <translation type="obsolete">反向臨界值(_B):</translation>
+ <location line="-27"/>
+ <source>Codec 4CC:	</source>
+ <translation>編解碼器 4CC:</translation>
 </message>
 <message>
- <source>_Noise threshold:</source>
- <translation type="obsolete">雜訊臨界值(_N):</translation>
+ <location line="-64"/>
+ <source>Stereo</source>
+ <translation>立體聲</translation>
 </message>
 <message>
- <source>Postp_rocessing threshold:</source>
- <translation type="obsolete">後置處理臨界值(_R):</translation>
+ <location line="+89"/>
+ <source>Codec:		</source>
+ <translation>編解碼器：		</translation>
 </message>
 <message>
- <source>_Use chroma to decide</source>
- <translation type="obsolete">使用色度來判定(_U)</translation>
+ <location line="-137"/>
+ <source>%s (%u:%u)</source>
+ <translation>%s (%u:%u)</translation>
 </message>
 <message>
- <source>Sho_w info</source>
- <translation type="obsolete">顯示資訊(_W)</translation>
+ <location line="+141"/>
+ <source>Bitrate:	</source>
+ <translation>位元率:	</translation>
 </message>
 <message>
- <source>Debu_g</source>
- <translation type="obsolete">除錯(_G)</translation>
+ <location line="+4"/>
+ <source>Frequency:	</source>
+ <translation>頻率:	</translation>
 </message>
 <message>
- <source>Bl_end</source>
- <translation type="obsolete">混合(_E)</translation>
+ <location line="-21"/>
+ <source>ExtraDataSize:	</source>
+ <translation>額外的資料大小：	</translation>
 </message>
 <message>
- <source>Decomb Telecide</source>
- <translation type="obsolete">去除梳形雜訊電視電影</translation>
+ <location line="-4"/>
+ <location line="+27"/>
+ <source>Total Duration:	</source>
+ <translation>總持續時間：	</translation>
 </message>
 </context>
 <context>
- <name>Ui_licenseWindow</name>
+ <name>qshell</name>
 <message>
- <source>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="obsolete">&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux 是自由軟體；您可以遵照自由軟體基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式。&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+44"/>
+ <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
+Ready.
+</source>
+ <translation>你可以使用 CTRL + PageUP and CTRL+Page到回到先前命令準備時。</translation>
 </message>
-</context>
-<context>
- <name>Ui_vobsubWindow</name>
 <message>
- <source>Select Idx File</source>
- <translation type="obsolete">選擇 Idx 檔案</translation>
+ <location line="-1"/>
+ <source>Enter your commands then press the evaluate button or CTRL+ENTER.
+</source>
+ <translation>輸入您的命令，然後按下求值按鈕或按 CTRL + ENTER。</translation>
 </message>
 </context>
 <context>
- <name>VapourSynthProxy</name>
+ <name>qtalert</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui" line="+14"/>
- <source>VapourSynth Proxy</source>
- <translation type="unfinished"></translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+38"/>
+ <location line="+25"/>
+ <location line="+25"/>
+ <source>Info</source>
+ <translation>資訊</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Select VS file</source>
- <translation type="unfinished"></translation>
+ <location line="-56"/>
+ <source>Alert</source>
+ <translation>警告</translation>
 </message>
 <message>
- <location line="+11"/>
- <source>...</source>
- <translation type="unfinished">...</translation>
+ <location line="+129"/>
+ <location line="+30"/>
+ <source>Question</source>
+ <translation>問題</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Run!</source>
- <translation type="unfinished"></translation>
+ <location line="-7"/>
+ <source>Question?</source>
+ <translation>問題?</translation>
+ </message>
+ <message>
+ <location line="-72"/>
+ <location line="+30"/>
+ <source>Confirmation</source>
+ <translation>答覆</translation>
 </message>
 </context>
 <context>
- <name>XvidConfigDialog</name>
+ <name>qtray</name>
 <message>
- <source>&lt;default&gt;</source>
- <translation type="obsolete">&lt;預設&gt;</translation>
+ <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
+ <source>Open Avidemux</source>
+ <translation>開啟 Avidemux</translation>
 </message>
+</context>
+<context>
+ <name>qvobsub</name>
 <message>
- <source>&lt;custom&gt;</source>
- <translation type="obsolete">&lt;自訂&gt;</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
+ <source>Select Idx File</source>
+ <translation>選擇 Idx 檔案</translation>
 </message>
+</context>
+<context>
+ <name>removeplane</name>
 <message>
- <source>Save As</source>
- <translation type="obsolete">另存新檔</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+46"/>
+ <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
+ <translation>刪除 Y，U 或 V 平面 （主要用於調試其他篩選器）。</translation>
 </message>
 <message>
- <source>Are you sure you wish to delete the selected configuration?</source>
- <translation type="obsolete">確定要刪除所選的設定嗎?</translation>
+ <location line="+106"/>
+ <source>Keep U Plane</source>
+ <translation>維持 U 平面</translation>
 </message>
 <message>
- <source>Quantiser:</source>
- <translation type="obsolete">量化值:</translation>
+ <location line="+1"/>
+ <source>Process chromaV plane</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>MB</source>
- <translation type="obsolete">MB</translation>
+ <location line="+5"/>
+ <source>Remove plane</source>
+ <translation>刪除平面</translation>
 </message>
 <message>
- <source>Average Bitrate:</source>
- <translation type="obsolete">平均位元率:</translation>
+ <location line="-113"/>
+ <source>Remove Plane</source>
+ <translation>3.4-刪除平面</translation>
 </message>
 <message>
- <source>Configuration:</source>
- <translation type="obsolete">設定:</translation>
+ <location line="+107"/>
+ <source>Process chromaU plane</source>
+ <translation>程序 色度U 平面</translation>
 </message>
 <message>
- <source>Delete</source>
- <translation type="obsolete">刪除</translation>
+ <location line="-1"/>
+ <source>Process luma plane</source>
+ <translation>處理明度平面</translation>
 </message>
 <message>
- <source>Rate Control</source>
- <translation type="obsolete">比率控制</translation>
+ <location line="+2"/>
+ <source>Keep V Plane</source>
+ <translation>維持 V 平面</translation>
 </message>
 <message>
- <source>Pixel Aspect Ratio</source>
- <translation type="obsolete">像素外觀比例</translation>
+ <location line="-2"/>
+ <source>Keep Y Plane</source>
+ <translation>維持 Y 平面</translation>
 </message>
+</context>
+<context>
+ <name>resampleFps</name>
 <message>
- <source>As Input</source>
- <translation type="obsolete">另輸出為</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+46"/>
+ <source>29.97 (NTSC)</source>
+ <translation>29.97 (NTSC)</translation>
 </message>
 <message>
- <source>Auto-detect</source>
- <translation type="obsolete">自動偵測</translation>
+ <location line="+1"/>
+ <source>50 (Pal)</source>
+ <translation>50 (Pal)</translation>
 </message>
 <message>
- <source>Motion</source>
- <translation type="obsolete">動作</translation>
+ <location line="-3"/>
+ <source>25 (PAL)</source>
+ <translation>25 (PAL)</translation>
 </message>
 <message>
- <source>Motion Estimation</source>
- <translation type="obsolete">動作估測</translation>
+ <location line="+39"/>
+ <source>Resample FPS</source>
+ <translation>1.0-調整幀速度(重新取樣)-用在數碼轉換DVD</translation>
 </message>
 <message>
- <source>Low</source>
- <translation type="obsolete">低</translation>
+ <location line="+285"/>
+ <source>Resample fps</source>
+ <translation>重新取樣 fps</translation>
 </message>
 <message>
- <source>Medium</source>
- <translation type="obsolete">中</translation>
+ <location line="-325"/>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <source>High</source>
- <translation type="obsolete">高</translation>
+ <location line="+318"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
 </message>
 <message>
- <source>Limited Search</source>
- <translation type="obsolete">限度搜尋</translation>
+ <location line="-316"/>
+ <source>23.976 (Film)</source>
+ <translation>23.976 (電影)</translation>
 </message>
 <message>
- <source>Medium Search</source>
- <translation type="obsolete">中等搜尋</translation>
+ <location line="+3"/>
+ <source>59.93 (NTSC)</source>
+ <translation>59.93 (NTSC)</translation>
 </message>
 <message>
- <source>Wide Search</source>
- <translation type="obsolete">廣泛搜尋</translation>
+ <location line="+36"/>
+ <source>Change and enforce FPS. Keep duration and sync.</source>
+ <translation>結束時間仍然一樣，例如15 fps電影從數碼轉換 DVD，一般PC上看不出來效果。</translation>
 </message>
 <message>
- <source>Two Pass</source>
- <translation type="obsolete">二次運算</translation>
+ <location line="+278"/>
+ <source>_New frame rate:</source>
+ <translation>_新幀率:</translation>
 </message>
+</context>
+<context>
+ <name>resize</name>
 <message>
- <source>Curve Compression</source>
- <translation type="obsolete">曲線壓縮</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+ <source>swScale Resizer.</source>
+ <translation>調整比例像素大小。</translation>
 </message>
 <message>
- <source>Video Buffer Verifier</source>
- <translation type="obsolete">視訊緩衝校對器</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+306"/>
+ <source>Width and height cannot be odd</source>
+ <translation>寬度和高度不能為奇數</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="-1"/>
+ <source>swsResize</source>
+ <translation>1.2-調整影片尺寸-比例像素大小</translation>
 </message>
 </context>
 <context>
- <name>aboutDialog</name>
+ <name>resizeDialog</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
- <source>About Avidemux</source>
- <translation type="unfinished">關於 Avidemux</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+264"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+287"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+287"/>
+ <source>1%</source>
+ <translation>1%</translation>
 </message>
 <message>
- <location line="+93"/>
- <source>Avidemux </source>
- <translation type="unfinished">Avidemux </translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-224"/>
+ <location line="+42"/>
+ <source>1:1</source>
+ <translation>1:1</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>Multi-platform Video Editor</source>
- <translation type="unfinished">跨平台影片編輯工具</translation>
+ <location line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <source>4:3</source>
+ <translation>4:3</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>© 2001 - 2017 Mean</source>
- <translation type="unfinished"></translation>
+ <location line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+ <location line="+42"/>
+ <source>16:9</source>
+ <translation>16:9</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>http://www.avidemux.org</source>
- <translation type="unfinished">http://www.avidemux.org</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+40"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+212"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+212"/>
+ <source>200%</source>
+ <translation>200%</translation>
 </message>
 <message>
- <location line="+45"/>
- <source>&amp;License</source>
- <translation type="unfinished">授權(&amp;L)</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-230"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-230"/>
+ <source>Destination:</source>
+ <translation>目的檔:</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>OK</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+116"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+346"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+346"/>
+ <source>Bilinear</source>
+ <translation>雙線性</translation>
 </message>
-</context>
-<context>
- <name>addBorder</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
- <source>_Left border:</source>
- <translation type="unfinished">左側邊界(_L):</translation>
+ <location line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-66"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-66"/>
+ <source>Error X / Y:</source>
+ <translation>錯誤 X / Y:</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>_Right border:</source>
- <translation type="unfinished">右側邊界(_R):</translation>
+ <location line="-317"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-340"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-340"/>
+ <source>Lock Aspect Ratio</source>
+ <translation>維持像素比</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>_Top border:</source>
- <translation type="unfinished">頂部邊界(_T):</translation>
+ <location line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-12"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-12"/>
+ <source>Aspect Ratio</source>
+ <translation>像素比例( PAR)</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>_Bottom border:</source>
- <translation type="unfinished">底部邊界(_B):</translation>
+ <location line="+336"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+359"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+359"/>
+ <source>0.00 / 0.00</source>
+ <translation>0.00 / 0.00</translation>
 </message>
 <message>
- <location line="+3"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+42"/>
- <source>Add Borders</source>
- <translation type="unfinished">加入邊框</translation>
+ <location line="-348"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-371"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-371"/>
+ <source>Resize</source>
+ <translation>調整大小</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Incorrect parameters</source>
- <translation type="unfinished">不正確的參數</translation>
+ <location line="+39"/>
+ <source>Source PAR:</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+0"/>
- <source>All parameters must be even and within range.</source>
- <translation type="unfinished">所有參數必須是偶數且在範圍內。</translation>
+ <location line="+8"/>
+ <location line="+32"/>
+ <source>1:1 (square pixels)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+1"/>
- <source>Add black borders around the image.</source>
+ <location line="-8"/>
+ <source>Destination PAR:</source>
 <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>addLogopFilter</name>
 <message>
- <source>_Logo (jpg file):</source>
- <translation type="obsolete">圖標(_L)(jpg 檔):</translation>
+ <location line="+54"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+148"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+148"/>
+ <source>Width:</source>
+ <translation>寬度:</translation>
 </message>
 <message>
- <source>Select JPEG file</source>
- <translation type="obsolete">選擇 JPEG 檔案</translation>
+ <location line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+146"/>
+ <source>Percent</source>
+ <translation>百分比</translation>
 </message>
 <message>
- <source>_X Position:</source>
- <translation type="obsolete">_X 位置:</translation>
+ <location line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+146"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+146"/>
+ <source>Lanzcos3</source>
+ <translation>Lanzcos3三階線性</translation>
 </message>
 <message>
- <source>_Y Position:</source>
- <translation type="obsolete">_Y 位置:</translation>
+ <location line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-5"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-5"/>
+ <source>Bicubic</source>
+ <translation>雙立方</translation>
 </message>
 <message>
- <source>_Alpha:</source>
- <translation type="obsolete">_Alpha:</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-393"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-393"/>
+ <source>Source:</source>
+ <translation>來源:</translation>
 </message>
 <message>
- <source>Logo</source>
- <translation type="obsolete">圖標</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="-216"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+177"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+177"/>
+ <source>Round to the Nearest Multiple of 16</source>
+ <translation>被最接近16倍整除的四捨五入整數</translation>
 </message>
-</context>
-<context>
- <name>adm</name>
 <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
- <source>Decode video using DXVA2 (windows)</source>
- <translation type="unfinished"></translation>
+ <location line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-91"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-91"/>
+ <source>Resize Dimensions</source>
+ <translation>調整顯示尺寸(DAR)</translation>
 </message>
 <message>
- <source>_Use systray while encoding</source>
- <translation type="obsolete">編碼時使用工作欄(_U)</translation>
+ <location line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+56"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+56"/>
+ <source>Height:</source>
+ <translation>高度:</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>_Accept non-standard audio frequency for DVD</source>
- <translation type="unfinished">同意在 DVD 使用非標準的音訊頻率(_A)</translation>
+ <location line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+238"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+238"/>
+ <source>Resize Method:</source>
+ <translation>調整大小方式:</translation>
 </message>
+</context>
+<context>
+ <name>rotate</name>
 <message>
- <location line="+1"/>
- <source>Create _OpenDML files</source>
- <translation type="unfinished">建立 _OpenDML 檔案</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+209"/>
+ <source>90°</source>
+ <translation>90°</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>_Revert to saved default output settings on video load</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>_Enable alternative keyboard shortcuts</source>
- <translation type="unfinished"></translation>
+ <location line="+2"/>
+ <source>180°</source>
+ <translation>180°</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Re_verse UP and DOWN arrow keys for navigation</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>SIMD</source>
- <translation type="unfinished">SIMD</translation>
+ <source>270°</source>
+ <translation>270°</translation>
 </message>
 <message>
 <location line="+2"/>
- <source>Enable all SIMD</source>
- <translation type="unfinished">開啟所有 SIMD</translation>
+ <source>_Angle:</source>
+ <translation>_角度:</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable MMX</source>
- <translation type="unfinished">開啟 MMX</translation>
+ <location line="-161"/>
+ <location line="+163"/>
+ <source>Rotate</source>
+ <translation>1.1-順時針旋轉</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable MMXEXT</source>
- <translation type="unfinished">開啟 MMXEXT</translation>
+ <location line="-5"/>
+ <source>180 degrees</source>
+ <translation>180 度</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Enable 3DNOW</source>
- <translation type="unfinished">開啟 3DNOW</translation>
+ <source>270 degrees</source>
+ <translation>270 度</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable 3DNOWEXT</source>
- <translation type="unfinished">開啟 3DNOWEXT</translation>
+ <location line="-2"/>
+ <source>90 degrees</source>
+ <translation>90 度</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable SSE</source>
- <translation type="unfinished">開啟 SSE</translation>
+ <location line="-156"/>
+ <source>Rotate the image by 90/180/270 degrees.</source>
+ <translation>旋轉圖片90/180/270度</translation>
 </message>
+</context>
+<context>
+ <name>seekablePreviewDialog</name>
 <message>
- <location line="+1"/>
- <source>Enable SSE2</source>
- <translation type="unfinished">開啟 SSE2</translation>
+ <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+78"/>
+ <source>&gt;</source>
+ <translation>&gt;</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable SSE3</source>
- <translation type="unfinished">開啟 SSE3</translation>
+ <location line="-3"/>
+ <source>&lt;&lt;</source>
+ <translation>&lt;&lt;</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Enable SSSE3</source>
- <translation type="unfinished">開啟 SSSE3</translation>
+ <location line="+4"/>
+ <source>&gt;&gt;</source>
+ <translation>&gt;&gt;</translation>
 </message>
 <message>
- <location line="+21"/>
- <source>_lavc threads:</source>
- <translation type="unfinished">_lavc 訊息串:</translation>
+ <location line="-3"/>
+ <source>Play</source>
+ <translation>播放/停止</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Multi-threading</source>
- <translation type="unfinished">多執行緒</translation>
+ <location line="-2"/>
+ <source>Back one minute</source>
+ <translation>後一分鐘</translation>
 </message>
 <message>
- <location line="+4"/>
- <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
- <source>High</source>
- <translation type="unfinished">高</translation>
+ <location line="+3"/>
+ <source>Next image</source>
+ <translation>下一張圖像</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Above normal</source>
- <translation type="unfinished">高於一般</translation>
+ <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
+ <source>Preview</source>
+ <translation>預覽</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Normal</source>
- <translation type="unfinished">一般</translation>
+ <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+3"/>
+ <source>Forward one minute</source>
+ <translation>前一分鐘</translation>
 </message>
+</context>
+<context>
+ <name>separateFields</name>
 <message>
- <location line="+1"/>
- <source>Below normal</source>
- <translation type="unfinished">低於一般</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
+ <source>Separate Fields</source>
+ <translation>2.7-影片分離掃描場上下擠壓，畫面在水平中帶</translation>
 </message>
 <message>
 <location line="+1"/>
- <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
- <source>Low</source>
- <translation type="unfinished">低</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Encoding priority:</source>
- <translation type="unfinished">編碼優先次序(_E):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Indexing/unpacking priority:</source>
- <translation type="unfinished">索引/拆開打包的優先次序(_I):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Playback priority:</source>
- <translation type="unfinished">倒帶優先次序(_P):</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prioritisation</source>
- <translation type="unfinished">優化</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">在 .mp4 對 MP3 使用選擇對象標籤(_U)</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Default to the directory of the last read file for saving</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>XVideo (best)</source>
- <translation type="unfinished">XVideo (最好)</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>DXVA2 (best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+15"/>
- <source>SDL (good)</source>
- <translation type="unfinished">SDL (好)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Video _display:</source>
- <translation type="unfinished">視訊顯示(_D):</translation>
- </message>
- <message>
- <location line="+29"/>
- <source>No alerts</source>
- <translation type="unfinished">不顯示任何警告</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Display only error alerts</source>
- <translation type="unfinished">只顯示錯誤警告</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Display all alerts</source>
- <translation type="unfinished">顯示所有警告</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Message level:</source>
- <translation type="unfinished">訊息等級(_M):</translation>
- </message>
- <message>
- <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
- <source>PCM</source>
- <translation type="unfinished">PCM</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Master</source>
- <translation type="unfinished">主要</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Volume control:</source>
- <translation type="unfinished">音量控制(_V):</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>No downmixing</source>
- <translation type="unfinished">沒有降混</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+48"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
- <source>Stereo</source>
- <translation type="unfinished">立體聲</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
- <source>Pro Logic</source>
- <translation type="unfinished">定向邏輯</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Pro Logic II</source>
- <translation type="unfinished">第二代定向邏輯</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Local playback downmixing:</source>
- <translation type="unfinished">局部倒帶降混(_L):</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>_AudioDevice</source>
- <translation type="unfinished">音訊裝置(_A)</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+38"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
- <source>_Horizontal deblocking</source>
- <translation type="unfinished">去除水平方向塊狀色斑(_H)</translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
- <source>_Vertical deblocking</source>
- <translation type="unfinished">去除垂直方向塊狀色斑(_V)</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
- <source>De_ringing</source>
- <translation type="unfinished">去除環狀色斑(_R)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Strength:</source>
- <translation type="unfinished">強度(_S):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Default Postprocessing</source>
- <translation type="unfinished">預設的後置處理</translation>
- </message>
- <message>
- <location line="+45"/>
- <source>User Interface</source>
- <translation type="unfinished">使用介面</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Output</source>
- <translation type="unfinished">輸出</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+80"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
- <location line="+3"/>
- <location line="+5"/>
- <location filename="../../common/gui_save.cpp" line="+282"/>
- <location line="+21"/>
- <location line="+7"/>
- <location filename="../../common/gui_savenew.cpp" line="+403"/>
- <source>Audio</source>
- <translation type="unfinished">音訊</translation>
- </message>
- <message>
- <location filename="../../common/gui_savenew.cpp" line="-73"/>
- <location line="+12"/>
- <location line="+16"/>
- <location line="+8"/>
- <source>Video</source>
- <translation type="unfinished">視訊</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+30"/>
- <source>CPU</source>
- <translation type="unfinished">CPU</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
- <source>Threading</source>
- <translation type="unfinished">執行緒</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Preferences</source>
- <translation type="unfinished">偏好設定</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+41"/>
- <source>Close</source>
- <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="-1"/>
- <source>Connect to avsproxy</source>
- <translation type="unfinished">連線至 avsproxy</translation>
- </message>
- <message>
- <location line="+23"/>
- <source>Copy</source>
- <translation type="unfinished">複製</translation>
- </message>
- <message>
- <location line="+3"/>
- <location line="+2"/>
- <source>Delete</source>
- <translation type="unfinished">刪除</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Set Marker A</source>
- <translation type="unfinished">設定標記 A</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Set Marker B</source>
- <translation type="unfinished">設定標記 B</translation>
- </message>
- <message>
- <location line="+14"/>
- <location line="+8"/>
- <source>Filters</source>
- <translation type="unfinished">濾鏡</translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Play/Stop</source>
- <translation type="unfinished">播放/停止</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Previous Intra Frame</source>
- <translation type="unfinished">上一個內部畫格</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Next Intra Frame</source>
- <translation type="unfinished">上一個內部畫格</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Previous Black Frame</source>
- <translation type="unfinished">上一個黑畫面</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Next Black Frame</source>
- <translation type="unfinished">下一個黑畫面</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
- <source>R_esampling (Hz):</source>
- <translation type="unfinished">重複取樣(_E) (Hz):</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Resampling frequency (Hz)</source>
- <translation type="unfinished">重複取樣頻率 (Hz)</translation>
- </message>
- <message>
- <location line="+4"/>
- <location line="+25"/>
- <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="-24"/>
- <source>Film to PAL</source>
- <translation type="unfinished">Film 轉成 PAL</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>PAL to Film</source>
- <translation type="unfinished">PAL 轉成 Film</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>_Frame rate change:</source>
- <translation type="unfinished">畫格率改變(_F):</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>No change</source>
- <translation type="unfinished">沒有改變</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Mono</source>
- <translation type="unfinished">單音</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Stereo+surround</source>
- <translation type="unfinished">立體+環繞</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Stereo+center</source>
- <translation type="unfinished">立體+中央</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Stereo+center+surround</source>
- <translation type="unfinished">立體+中央+環繞</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Stereo front+stereo rear</source>
- <translation type="unfinished">前段立體+後段立體</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>5 channels</source>
- <translation type="unfinished">5 聲道</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>5.1</source>
- <translation type="unfinished">5.1</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Dolby Pro Logic</source>
- <translation type="unfinished">杜比定向邏輯</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Dolby Pro Logic II</source>
- <translation type="unfinished">第二代杜比定向邏輯</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Automatic (max -3 dB)</source>
- <translation type="unfinished">自動 (最大值 -3 dB)</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>_Gain mode:</source>
- <translation type="unfinished">增益模式(_G):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>G_ain value:</source>
- <translation type="unfinished">增益值(_A):</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>_Mixer:</source>
- <translation type="unfinished">混合器(_M):</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Audio Filters</source>
- <translation type="unfinished">音訊濾鏡</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-16"/>
- <source>Fontconfig</source>
- <translation type="unfinished">Fontconfig</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Gettext</source>
- <translation type="unfinished">Gettext</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>SDL</source>
- <translation type="unfinished">SDL</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>XVideo</source>
- <translation type="unfinished">XVideo</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>x86</source>
- <translation type="unfinished">x86</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>x86-64</source>
- <translation type="unfinished">x86-64</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Libraries</source>
- <translation type="unfinished">函式庫</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Built-in Support</source>
- <translation type="unfinished">內建的支援</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
- <source>_Job name:</source>
- <translation type="unfinished">工作名稱(_J):</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Output _File:</source>
- <translation type="unfinished">輸出檔案(_F):</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Select Video To Write</source>
- <translation type="unfinished">選擇影片來寫入</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Save Job</source>
- <translation type="unfinished">儲存工作</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-23"/>
- <source>Audio Plugins</source>
- <translation type="unfinished">音訊外掛模組</translation>
- </message>
- <message>
- <location line="+29"/>
- <source>Video Encoder Plugins</source>
- <translation type="unfinished">視訊編碼器外掛模組</translation>
- </message>
- <message>
- <location line="+24"/>
- <source>Video Encoder</source>
- <translation type="unfinished">視訊編碼器</translation>
- </message>
- <message>
- <location line="+34"/>
- <source>Audio Device Plugins</source>
- <translation type="unfinished">音訊裝置外掛模組</translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Audio Device</source>
- <translation type="unfinished">音訊裝置</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Audio Encoder Plugins</source>
- <translation type="unfinished">音訊編碼器外掛模組</translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Audio Encoders</source>
- <translation type="unfinished">音訊編碼器</translation>
- </message>
- <message>
- <location line="+64"/>
- <source>Plugins Info</source>
- <translation type="unfinished">外掛模組資訊</translation>
- </message>
- <message>
- <location filename="../../common/gui_autodrive.cpp" line="+64"/>
- <location line="+14"/>
- <location line="+31"/>
- <location line="+6"/>
- <location line="+15"/>
- <location line="+27"/>
- <location line="+35"/>
- <source>Codec Error</source>
- <translation type="unfinished">編解碼器錯誤</translation>
- </message>
- <message>
- <location filename="../../common/gui_main.cpp" line="+352"/>
- <source>Not coded in this version</source>
- <translation type="unfinished">沒有編進這個版本</translation>
- </message>
- <message>
- <source>Select AVI File...</source>
- <translation type="obsolete">選擇 AVI 檔案...</translation>
- </message>
- <message>
- <source>Select AVI File to Append...</source>
- <translation type="obsolete">選擇 AVI 檔進行添加...</translation>
- </message>
- <message>
- <location line="+241"/>
- <source>Are you sure?</source>
- <translation type="unfinished">確定嗎?</translation>
- </message>
- <message>
- <location line="+119"/>
- <source>Permission error</source>
- <translation type="unfinished">權限許可錯誤</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Cannot open &quot;%s&quot;.</source>
- <translation type="unfinished">無法開啟 &quot;%s&quot;。</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>File error</source>
- <translation type="unfinished">檔案錯誤</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>&quot;%s&quot; does not exist.</source>
- <translation type="unfinished">&quot;%s&quot; 不存在。</translation>
- </message>
- <message>
- <location line="+49"/>
- <source>Cannot open project using the video loader.</source>
- <translation type="unfinished">使用視訊載入器時無法開啟專案。</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
- <translation type="unfinished">嘗試 &apos;檔案&apos; -&gt; &apos;載入/執行 專案...&apos;</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Could not open the file</source>
- <translation type="unfinished">無法開啟此檔案</translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Multiple Audio Tracks</source>
- <translation type="unfinished">多音軌</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The file you just loaded contains several audio tracks.
-Go to Audio-&gt;MainTrack to select the active one.</source>
- <translation type="unfinished">這檔案剛剛載入包含一些音訊軌道。
-前往 音訊-&gt;主要軌道 來選擇作用中的軌道。</translation>
- </message>
- <message>
- <location line="+105"/>
- <source>Something failed when appending</source>
- <translation type="unfinished">當添加時某些事情失敗</translation>
- </message>
- <message>
- <location line="+5"/>
- <location line="+268"/>
- <source>Something bad happened (II)</source>
- <translation type="unfinished">不幸的事情發生 (II)</translation>
- </message>
- <message>
- <location line="-151"/>
- <location line="+43"/>
- <source>The tinypy plugin is missing.
-Expect problems.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+52"/>
- <source>Checking video</source>
- <translation type="unfinished">正在檢查視訊</translation>
- </message>
- <message>
- <location line="+16"/>
- <source>No error found</source>
- <translation type="unfinished">沒有找到錯誤</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Errors found in %u frames</source>
- <translation type="unfinished">在 %u 畫格中發現錯誤</translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Marker A &gt; B</source>
- <translation type="unfinished">標記 A &gt; B</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Cannot delete the selection.</source>
- <translation type="unfinished">無法刪除此選取範圍。</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>You can&apos;t remove all frames</source>
- <translation type="unfinished">你不能移除所有的畫格</translation>
- </message>
- <message>
- <location line="+96"/>
- <source>_Track from video:</source>
- <translation type="unfinished">影片中的軌道(_T):</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Main Audio Track</source>
- <translation type="unfinished">主要音軌</translation>
- </message>
- <message>
- <location line="+258"/>
- <source>AvsProxy</source>
- <translation type="unfinished">AvsProxy</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Failed to connect to avsproxy.
-Is it running ?</source>
- <translation type="unfinished">無法連線到 avsproxy。
-要繼續執行嗎?</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>avsproxy</source>
- <translation type="unfinished">avsproxy</translation>
- </message>
- <message>
- <location line="+34"/>
- <source>Frame type:</source>
- <translation type="unfinished">畫格類型:</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Frame size:</source>
- <translation type="unfinished">畫格大小:</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Frame Hex Dump</source>
- <translation type="unfinished">畫格二位元轉出(_F)</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+34"/>
- <source>Go to Time</source>
- <translation type="unfinished">前往時間點</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-12"/>
- <source>_Filter strength:</source>
- <translation type="unfinished">濾鏡強度(_F):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Swap U and V</source>
- <translation type="unfinished">置換 U 和 V(_S)</translation>
- </message>
- <message>
- <location filename="../../common/gui_save.cpp" line="-222"/>
- <source>Select Workbench to Save</source>
- <translation type="unfinished">選擇工作台進行儲存</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Select File to Save Audio</source>
- <translation type="unfinished">選擇檔案來儲存音訊</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Select JPEG Sequence to Save</source>
- <translation type="unfinished">選擇 JPEG 順序進行儲存</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Select BMP to Save</source>
- <translation type="unfinished">選擇 BMP 進行儲存</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Select JPEG to Save</source>
- <translation type="unfinished">選擇 JPG 進行儲存</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Select File to Save</source>
- <translation type="unfinished">選擇檔案進行儲存</translation>
- </message>
- <message>
- <location line="+62"/>
- <source>Saving audio</source>
- <translation type="unfinished">正在儲存音訊</translation>
- </message>
- <message>
- <location line="+179"/>
- <source>Saving as set of jpegs</source>
- <translation type="unfinished">正在另存為整套 jpeg 檔</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Cannot decode frame</source>
- <translation type="unfinished">無法解碼畫格</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Aborting.</source>
- <translation type="unfinished">正在中止。</translation>
- </message>
- <message>
- <location line="+11"/>
- <location line="+38"/>
- <source>Done</source>
- <translation type="unfinished">完成</translation>
- </message>
- <message>
- <location line="-38"/>
- <source>Saved %d images.</source>
- <translation type="unfinished">已儲存 %d 個圖像。</translation>
- </message>
- <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
- <location line="+42"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
- <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="-244"/>
- <location line="+27"/>
- <location line="+24"/>
- <location line="+8"/>
- <location line="+4"/>
- <location filename="../../common/gui_save.cpp" line="+2"/>
- <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="+0"/>
- <source>Could not save all images.</source>
- <translation type="unfinished">無法儲存所有圖像。</translation>
- </message>
- <message>
- <location line="+22"/>
- <source>BMP op failed</source>
- <translation type="unfinished">BMP 運算失敗</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Saving %s as a BMP file failed.</source>
- <translation type="unfinished">另存 %s 為 BMP 檔失敗。</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>File %s has been successfully saved.</source>
- <translation type="unfinished">檔案 %s 已經成功地儲存。</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Failed</source>
- <translation type="unfinished">已失敗</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>File %s was NOT saved correctly.</source>
- <translation type="unfinished">檔案 %s 儲存不正確。</translation>
- </message>
- <message>
- <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+47"/>
- <source>Custom</source>
- <translation type="unfinished">自訂</translation>
- </message>
- <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
- </message>
- <message>
- <source>_New frame rate:</source>
- <translation type="obsolete">新畫格率(_N):</translation>
- </message>
- <message>
- <source>Resample fps</source>
- <translation type="obsolete">重複取樣 fps</translation>
- </message>
- <message>
- <source>Default</source>
- <translation type="obsolete">預設</translation>
- </message>
- <message>
- <source>KVCD</source>
- <translation type="obsolete">KVCD</translation>
- </message>
- <message>
- <source>Progressive</source>
- <translation type="obsolete">漸進的</translation>
- </message>
- <message>
- <source>Interlacing</source>
- <translation type="obsolete">交錯</translation>
- </message>
- <message>
- <source>Rate Control</source>
- <translation type="obsolete">比率控制</translation>
- </message>
- <message>
- <source>Full</source>
- <translation type="obsolete">全部</translation>
- </message>
- <message>
- <source>Log</source>
- <translation type="obsolete">Log</translation>
- </message>
- <message>
- <source>EPZS</source>
- <translation type="obsolete">EPZS</translation>
- </message>
- <message>
- <source>H.263</source>
- <translation type="obsolete">H.263</translation>
- </message>
- <message>
- <source>MPEG</source>
- <translation type="obsolete">MPEG</translation>
- </message>
- <message>
- <source>Motion Estimation</source>
- <translation type="obsolete">動作估測</translation>
- </message>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+3"/>
- <source>Medium</source>
- <translation type="unfinished">中</translation>
- </message>
- <message>
- <source>VBR</source>
- <translation type="obsolete">VBR</translation>
- </message>
- <message>
- <source>Quality based</source>
- <translation type="obsolete">基本品質</translation>
- </message>
- <message>
- <source>_Bitrate:</source>
- <translation type="obsolete">位元率(_B):</translation>
- </message>
- <message>
- <source>_Quality:</source>
- <translation type="obsolete">品質(_Q):</translation>
- </message>
- <message>
- <source>Vorbis Configuration</source>
- <translation type="obsolete">Vorbis 設定</translation>
- </message>
- <message>
- <source>_Quantizer:</source>
- <translation type="obsolete">量化值(_Q):</translation>
- </message>
- <message>
- <source>CBR</source>
- <translation type="obsolete">CBR</translation>
- </message>
- <message>
- <source>ABR</source>
- <translation type="obsolete">ABR</translation>
- </message>
- <message>
- <source>Bit_rate mode:</source>
- <translation type="obsolete">位元率模式(_R):</translation>
- </message>
- <message>
- <source>LAME Configuration</source>
- <translation type="obsolete">LAME 設定</translation>
- </message>
- <message>
- <source>The filter is already partial</source>
- <translation type="obsolete">此濾鏡已經是區段性</translation>
- </message>
- <message>
- <source>Partial Start Frame:</source>
- <translation type="obsolete">區段起始畫格:</translation>
- </message>
- <message>
- <source>Partial End Frame:</source>
- <translation type="obsolete">區段結束畫格:</translation>
- </message>
- <message>
- <source>Configure child</source>
- <translation type="obsolete">設定子項目</translation>
- </message>
- <message>
- <source>Partial Video Filter</source>
- <translation type="obsolete">區段性視訊濾鏡</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Limited Search</source>
- <translation type="unfinished">限度搜尋</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Medium Search</source>
- <translation type="unfinished">中等搜尋</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Wide Search</source>
- <translation type="unfinished">廣泛搜尋</translation>
- </message>
- <message>
- <location line="+32"/>
- <source>Motion</source>
- <translation type="unfinished">動作</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Curve Compression</source>
- <translation type="unfinished">曲線壓縮</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Two Pass</source>
- <translation type="unfinished">二次運算</translation>
- </message>
- <message>
- <source>Ready</source>
- <translation type="obsolete">準備</translation>
- </message>
- <message>
- <source>Succeeded</source>
- <translation type="obsolete">已成功</translation>
- </message>
- <message>
- <source>Deleted</source>
- <translation type="obsolete">已刪除</translation>
- </message>
- <message>
- <source>Running</source>
- <translation type="obsolete">正在執行</translation>
- </message>
- <message>
- <source>Job Name</source>
- <translation type="obsolete">工作名稱</translation>
- </message>
- <message>
- <source>Status</source>
- <translation type="obsolete">狀態</translation>
- </message>
- <message>
- <source>Start Time</source>
- <translation type="obsolete">起始時間</translation>
- </message>
- <message>
- <source>End Time</source>
- <translation type="obsolete">終了時間</translation>
- </message>
- <message>
- <source>Sure!</source>
- <translation type="obsolete">確定!</translation>
- </message>
- <message>
- <source>Delete job</source>
- <translation type="obsolete">刪除工作</translation>
- </message>
- <message>
- <source>Are you sure you want to delete %s job?</source>
- <translation type="obsolete">確定要刪除 %s 工作?</translation>
- </message>
- <message>
- <source>Delete *all* job</source>
- <translation type="obsolete">刪除*所有*工作</translation>
- </message>
- <message>
- <source>Are you sure you want to delete ALL jobs?</source>
- <translation type="obsolete">確定要刪除所有工作?</translation>
- </message>
- <message>
- <source>Already done</source>
- <translation type="obsolete">已經完成</translation>
- </message>
- <message>
- <source>This script has already been successfully executed.</source>
- <translation type="obsolete">這個腳本已經成功執行。</translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-22"/>
- <source>Gain</source>
- <translation type="unfinished">增益</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>DRC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Manual (dB)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Remix:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Mixer</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Shift audio:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Shift Value (ms):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-19"/>
- <source>FreeType 2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VDPAU</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="-3"/>
- <source>TimeStamp:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-144"/>
- <source>Video Decoder Plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>Video Decoder</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+63"/>
- <source>Demuxer Plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Demuxers</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Muxer Plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Muxers</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+12"/>
- <source>_Deringing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-287"/>
- <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="+1"/>
- <source>Enable openGl support</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>If you use Hw decoding, it is better to use the matching display driver</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>_Check for new release</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <source>_Split MPEG files every (MB):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>VDPAU (best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>OpenGL (best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>LIBVA (best)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+28"/>
- <location line="+3"/>
- <source>Sdl driver</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+60"/>
- <source>System language</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+25"/>
- <source>_Language</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
- <source>_Limit Refresh Rate</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Refresh Rate Cap (ms)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>GUI Rendering Options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Display</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>HW Accel</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>_Always ask which port to use</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Default port to use</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
- <source>Open</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Append</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Save</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../common/gui_save.cpp" line="+14"/>
- <location line="+10"/>
- <source>Queue</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Save as Image</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Save as BMP</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Save as JPEG</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Information</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Quit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <location line="+2"/>
- <source>Clear recent items</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Undo</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Redo</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Reset Edit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Cut</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Paste</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Reset Markers</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Pr&amp;eferences</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Save current settings as default</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Load saved settings</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Decoder Option</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>PostProcessing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Select Track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Save audio</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Build Option</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Advanced</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Open Application &amp;Log</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Open Application Data &amp;Folder</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>About</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Previous Frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Next Frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>First Frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Last Frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Go To Marker A</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Go To Marker B</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Go To Time</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Zoom 1:4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Zoom 1:2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Zoom 1:1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Zoom 2:1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
- <location line="+42"/>
- <source>You cannot remove *all* the video
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
- <source>Updating frametype</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
- <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
-Installation mismatch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
- <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
-Installation mismatch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
- <source>Core has been compiled without XVBA support, but the application has been compiled with it.
-Installation mismatch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/gui_autodrive.cpp" line="-144"/>
- <source>No audio track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>An audio track is necessary to create such file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Cannot select the MPEG-4 SP codec.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>No AAC audio encoder plugin found.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+32"/>
- <source>The MP3 codec does not allow disabling reservoir.
-Install lame plugin</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>You don&apos;t have LAME!.
-It is needed to create FLV video.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Cannot select FLV1 codec.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+27"/>
- <source>Cannot select MPEG-4 SP codec.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+36"/>
- <source>You don&apos;t have FAAC!.
-It is needed to create PSP compatible video.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/gui_main.cpp" line="-1237"/>
- <source>Select script/project to run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>Select script to run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Select script to debug</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Select script to save</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+67"/>
- <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+108"/>
- <location line="+68"/>
- <source>Select Video File...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-43"/>
- <source>No engine</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>tinyPy script is not enabled in this build</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+46"/>
- <source>Select Video File to Append...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+206"/>
- <source>Cutting</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Error while cutting out.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+543"/>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
- <source>Something bad happened</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+120"/>
- <location line="+7"/>
- <source>Invalid audio index given</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Cannot use that file as audio track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+28"/>
- <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>Unable to set the audio language: No video loaded yet!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Setting the language for the given track index is not possible: Invalid track index!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+290"/>
- <source>Oops</source>
- <translation type="unfinished">Oops</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>This function is disabled or no longer valid</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/gui_play.cpp" line="+413"/>
- <source>Trouble initializing audio device</source>
- <translation type="unfinished">音訊裝置初始化時發生問題</translation>
- </message>
- <message>
- <location filename="../../common/gui_save.cpp" line="-391"/>
- <source>No</source>
- <translation type="unfinished">否</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>No file loaded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Job</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Cannot reach database. Do you have Job control running ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Output file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Job name</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Queue job to jobList</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+209"/>
- <source>Function not implemented
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Cannot create stream</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Saving failed</source>
- <translation type="unfinished">儲存失敗</translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Jpeg</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Fail to save as jpeg</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+104"/>
- <source>Cannot get tinyPÿ script engine</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Cannot add job %s</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/gui_savenew.cpp" line="-196"/>
- <source>Reuse previous first pass data ?
-Warning, the settings must be close.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+160"/>
- <source>Cannot instantiate video chain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <location line="+24"/>
- <source>Cannot create encoder</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-8"/>
- <source>Cannot setup codec. Bitrate too low?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+30"/>
- <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="-244"/>
- <location line="+255"/>
- <location line="+26"/>
- <source>Muxer</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-281"/>
- <location line="+255"/>
- <source>Cannot instantiate muxer</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+26"/>
- <source>Cannot open </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
- <source>Disabled</source>
- <translation type="unfinished">停用</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Auto-detect</source>
- <translation type="unfinished">自動偵測</translation>
- </message>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-87"/>
- <source>_Interlaced</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ca_rtoon mode</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Greyscale</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Turbo mode</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>C_hroma optimizer</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Main</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Very Low</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Very High</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ultra High</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Motion Search Precision</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Off</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Mode Decision</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>VHQ Mode</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Max B Frames</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Quarter Pixel</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>GMC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>BVHQ</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Advanced Simple Profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>4MV</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Chroma ME</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>HQ AC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>More Search</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Min Gop Size</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Gop Size</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>GOP Size</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>H263</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Mpeg</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Quantization Matrix</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Trellis Quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Two Pass Tuning</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Key Frame Boost(%)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>I-frames closer than...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>.. are reduced by(%)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Overflow Improvement(%)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Overglow Degradation(%)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>High Bitrate Scenes (%)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Low Bitrate Scenes (%)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Overflow Control Strength</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Xvid4 Configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
- <source>%d minute(s)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>%d hour(s)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+18"/>
- <source>Less than a minute</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>A few seconds</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-1"/>
- <source>DTS</source>
- <translation type="unfinished">DTS</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>MP2</source>
- <translation type="unfinished">MP2</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>MP3</source>
- <translation type="unfinished">MP3</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>WMAPRO</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>WMA</source>
- <translation type="unfinished">WMA</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>LPCM</source>
- <translation type="unfinished">LPCM</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>AC3</source>
- <translation type="unfinished">AC3</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>OPUS</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>FLAC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>E-AC3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ogg Vorbis</source>
- <translation type="unfinished">Ogg Vorbis</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>MP4</source>
- <translation type="unfinished">MP4</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>AAC</source>
- <translation type="unfinished">AAC</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>QDM2</source>
- <translation type="unfinished">QDM2</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>AMR-NB</source>
- <translation type="unfinished">AMR-NB</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>MSADPCM</source>
- <translation type="unfinished">MSADPCM</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>ULAW</source>
- <translation type="unfinished">ULAW</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>IMA ADPCM</source>
- <translation type="unfinished">IMA ADPCM</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>8-bit PCM</source>
- <translation type="unfinished">8位元 PCM</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unknown codec</source>
- <translation type="unfinished">未知的編解碼器</translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
- <source>Building time map</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
- <source>Memory error</source>
- <translation type="unfinished">記憶體錯誤</translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
- <source>Saving</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+142"/>
- <source>Too short</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The video has been saved but seems to be incomplete.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
- <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
- <source>Unknown</source>
- <translation type="unfinished">未知</translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
- <source>can&apos;t open &quot;%s&quot;: %s
-%s
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <location line="+85"/>
- <source>filesystem full</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-85"/>
- <location line="+85"/>
- <source>quota exceeded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-84"/>
- <location line="+85"/>
- <source>Please free up some space and press RETRY to try again.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-78"/>
- <source>can&apos;t open &quot;%s&quot;: %u (%s)
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+75"/>
- <source>can&apos;t write to file &quot;%s&quot;: %s
-%s
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location line="+11"/>
- <source>__unknown__</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-8"/>
- <source>Ignore</source>
- <translation type="unfinished">忽略</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Retry</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
- <source>NTSC 4:3</source>
- <translation type="unfinished">NTSC 4:3</translation>
- </message>
- <message>
- <location line="+1"/>
- <location line="+1"/>
- <source>NTSC 16:9</source>
- <translation type="unfinished">NTSC 16:9</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>PAL 4:3</source>
- <translation type="unfinished">PAL 4:3</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>PAL 16:9</source>
- <translation type="unfinished">PAL 16:9</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>1:1</source>
- <translation type="unfinished">1:1</translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
- <location line="+32"/>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
- <location line="+35"/>
- <source>Codec</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
- <source>Internal error finding codec 0x%x</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source>Internal error opening 0x%x</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
- <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
-Installation mismatch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+246"/>
- <source>Cannot compile shader</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>admIvtc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
- <source>ADM ivtc.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>All in one ivtc.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>aften</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
- <source>_Bitrate:</source>
- <translation type="unfinished">位元率(_B):</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Aften Configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>asciiView</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
- <source>Ascii View</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ascii view</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>asfdemuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
- <source>File Error.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Cannot open file
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+471"/>
- <source>Indexing</source>
- <translation type="unfinished">正在索引</translation>
- </message>
-</context>
-<context>
- <name>asharp</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="+66"/>
- <source>Adaptative sharpener by MarcFD.</source>
- <translation type="unfinished">適性銳利化器，作者為 MarcFD。</translation>
- </message>
- <message>
- <location line="-1"/>
- <source>Asharp</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>asharpDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui" line="+14"/>
- <source>ASharp</source>
- <translation type="unfinished">ASharp</translation>
- </message>
- <message>
- <location line="+123"/>
- <source>Strength</source>
- <translation type="unfinished">強度</translation>
- </message>
- <message>
- <location line="-13"/>
- <source>Threshold</source>
- <translation type="unfinished">臨界值</translation>
- </message>
- <message>
- <location line="-20"/>
- <source>Block Adaptative</source>
- <translation type="unfinished">區塊適性</translation>
- </message>
- <message>
- <location line="-27"/>
- <source>Unknown flag</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>ass</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+171"/>
- <source>_Subtitle file (ASS/SSA):</source>
- <translation type="unfinished">字幕檔(A_SS/SSA):</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Select Subtitle file</source>
- <translation type="unfinished">選擇字幕檔</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Line spacing:</source>
- <translation type="unfinished">行距(_L):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Font scale:</source>
- <translation type="unfinished">字體縮放(_F):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Top margin:</source>
- <translation type="unfinished">頂部邊界(_T):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Botto_m margin</source>
- <translation type="unfinished">底部邊界(_M)</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>ASS</source>
- <translation type="unfinished">ASS</translation>
- </message>
- <message>
- <location line="-112"/>
- <source>SSA/ASS/SRT</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Hardcode ass/ssa/srt subtitles using libass.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+62"/>
- <source>Format ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Are you sure this is an ass file ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+56"/>
- <source>This is a srt file. Convert to SSA ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <location line="+5"/>
- <location line="+8"/>
- <source>Error</source>
- <translation type="unfinished">錯誤</translation>
- </message>
- <message>
- <location line="-13"/>
- <source>Cannot load this srt file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Cannot convert to ssa.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Cannot save converted file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <source>Fonts</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Preparing the fonts can take a few minutes the first time.
-This message will not be displayed again.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+27"/>
- <source>SSA Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Cannot read_file for *%s*</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>autoWizard</name>
- <message>
- <source>Codec:</source>
- <translation type="obsolete">編解碼器:</translation>
- </message>
-</context>
-<context>
- <name>avimuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
- <source>Bad Idea</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
- Do you want to continue anyway ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Error</source>
- <translation type="unfinished">錯誤</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Cannot create AVI file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
- <source>Muxing Format</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Avi Muxer</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>avsfilter</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+598"/>
- <source>_wine app file:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Select wine filename[wine/cedega/etc.]</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_loader file:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Select loader filename[avsload.exe]</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_avs file:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Select avs filename[*.avs]</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_pipe timeout:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>AvsFilter config</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>bitrate</name>
- <message>
- <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
- <source>Constant Bitrate</source>
- <translation type="unfinished">固定位元率</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Constant Quantiser</source>
- <translation type="unfinished">固定量化值</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Same Quantiser as Input</source>
- <translation type="unfinished">量化值與輸入來源相同</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Constant Rate Factor</source>
- <translation type="unfinished">固定數比率係數</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Two Pass - Video Size</source>
- <translation type="unfinished">二次運算 - 視訊大小</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Two Pass - Average Bitrate</source>
- <translation type="unfinished">二次運算 - 平均位元率</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Encoding mode</source>
- <translation type="unfinished">編碼模式</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Bitrate</source>
- <translation type="unfinished">位元率</translation>
- </message>
- <message>
- <location line="+86"/>
- <source>Target bitrate (kb/s)</source>
- <translation type="unfinished">目標位元率 (kb/s)</translation>
- </message>
- <message>
- <location line="+5"/>
- <location line="+19"/>
- <source>Quantizer</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-14"/>
- <source>Target video size (MB)</source>
- <translation type="unfinished">目標視訊大小 (MB)</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Average bitrate (kb/s)</source>
- <translation type="unfinished">平均位元率 (kb/s)</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>-</source>
- <translation type="unfinished">-</translation>
- </message>
-</context>
-<context>
- <name>black</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
- <source>Black</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Replace a section by black.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Replace by Black</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>blacken</name>
- <message>
- <source>_Left border:</source>
- <translation type="obsolete">左側邊界(_L):</translation>
- </message>
- <message>
- <source>_Right border:</source>
- <translation type="obsolete">右側邊界(_R):</translation>
- </message>
- <message>
- <source>_Top border:</source>
- <translation type="obsolete">頂部邊界(_T):</translation>
- </message>
- <message>
- <source>_Bottom border:</source>
- <translation type="obsolete">底部邊界(_B):</translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
- <source>Blacken Borders</source>
- <translation type="unfinished">邊框填黑</translation>
- </message>
- <message>
- <source>Incorrect parameters</source>
- <translation type="obsolete">不正確的參數</translation>
- </message>
- <message>
- <source>All parameters must be even and within range.</source>
- <translation type="obsolete">所有參數必須是偶數且在範圍內。</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Remove noisy edge by turning them to black.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>blackenBorders</name>
- <message>
- <source>_Left border:</source>
- <translation type="obsolete">左側邊界(_L):</translation>
- </message>
- <message>
- <source>_Right border:</source>
- <translation type="obsolete">右側邊界(_R):</translation>
- </message>
- <message>
- <source>_Top border:</source>
- <translation type="obsolete">頂部邊界(_T):</translation>
- </message>
- <message>
- <source>_Bottom border:</source>
- <translation type="obsolete">底部邊界(_B):</translation>
- </message>
- <message>
- <source>Blacken Borders</source>
- <translation type="obsolete">邊框填黑</translation>
- </message>
- <message>
- <source>Incorrect parameters</source>
- <translation type="obsolete">不正確的參數</translation>
- </message>
- <message>
- <source>All parameters must be even and within range.</source>
- <translation type="obsolete">所有參數必須是偶數且在範圍內。</translation>
- </message>
-</context>
-<context>
- <name>blackenDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+14"/>
- <source>Blacken Borders</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+38"/>
- <source>Right:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Top:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+43"/>
- <source>Reset</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Bottom:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Left:</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>blackframes</name>
- <message>
- <location filename="../../common/gui_blackframes.cpp" line="+105"/>
- <source>BlackFrame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>This function is unsupported at the moment</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Searching black frame..</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>changeFps</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
- <source>Custom</source>
- <translation type="unfinished">自訂</translation>
- </message>
- <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
- </message>
- <message>
- <source>_New frame rate:</source>
- <translation type="obsolete">新畫格率(_N):</translation>
- </message>
- <message>
- <source>Resample fps</source>
- <translation type="obsolete">重複取樣 fps</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>25 (PAL)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>23.976 (Film)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>29.97 (NTSC)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>50 (Pal)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>59.93 (NTSC)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
- <source>Change FPS</source>
- <translation type="unfinished"></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"></translation>
- </message>
- <message>
- <location line="+130"/>
- <source>Source Fps:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Source frame rate:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Destination Fps:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Destination frame rate:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Change fps</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Error</source>
- <translation type="unfinished">錯誤</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invalid fps</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>chromashift</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+36"/>
- <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
- <translation type="unfinished">改變色度 U/V 來修復糟糕的明度/色度同步。</translation>
- </message>
- <message>
- <location line="-1"/>
- <source>ChromaShift</source>
- <translation type="unfinished">色度位移</translation>
- </message>
-</context>
-<context>
- <name>chromashiftDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
- <source>ChromaShift</source>
- <translation type="unfinished">色度位移</translation>
- </message>
- <message>
- <location line="+47"/>
- <source>V Shift</source>
- <translation type="unfinished">V 位移</translation>
- </message>
- <message>
- <location line="-23"/>
- <source>U Shift</source>
- <translation type="unfinished">U 位移</translation>
- </message>
-</context>
-<context>
- <name>coloryuv</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+78"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="-16"/>
- <source>Avisynth color filter.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Color management filter.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>AutoWhite</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>AutoGain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Clip to Tv Range (16-235)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>PC-&gt;TV</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>TV-&gt;PC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Levels:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Y gain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Y Brightness</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Y Gamma</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Y Contrast</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>U gain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>U Brightness</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>U Contrast</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>V gain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>V Brightness</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>V Contrast</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Flags</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Y</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>U</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>V</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>colorYuv</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>contrast</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+35"/>
- <source>Adjust contrast, brightness and colors.</source>
- <translation type="unfinished">調整對比、亮度和色彩。</translation>
- </message>
- <message>
- <location line="-1"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
- <location line="+89"/>
- <source>Contrast</source>
- <translation type="unfinished">對比</translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
- <location line="+89"/>
- <source>Brightness</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>contrastDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui" line="+14"/>
- <location line="+19"/>
- <source>Contrast</source>
- <translation type="unfinished">對比</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>Contrast </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+41"/>
- <source>Brightness </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+60"/>
- <source>Luma</source>
- <translation type="unfinished">明度</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Process</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>MPEG2-&gt;PC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-43"/>
- <source>ChromaU</source>
- <translation type="unfinished">色度U</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>ChromaV</source>
- <translation type="unfinished">色度V</translation>
- </message>
- <message>
- <location line="-46"/>
- <source>Brightness</source>
- <translation type="unfinished">亮度</translation>
- </message>
-</context>
-<context>
- <name>convolution</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+136"/>
- <source>_Process luma</source>
- <translation type="unfinished">處理明度(_P)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Process luma plane</source>
- <translation type="unfinished">處理明度平面</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>P_rocess chroma</source>
- <translation type="unfinished">處理色度(_R)</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Fast Convolution</source>
- <translation type="unfinished">快速卷積</translation>
- </message>
-</context>
-<context>
- <name>crash</name>
- <message>
- <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
- <source>Load it</source>
- <translation type="unfinished">載入它</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Crash file</source>
- <translation type="unfinished">損壞檔</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>I have detected a crash file. 
-Do you want to load it ?
-(It will be deleted in all cases, you should save it if you want to keep it)</source>
- <translation type="unfinished">偵測到一個損壞檔。
-是否要載入 ?
-(在所有的案例都會偵測，若要保存它你必須執行儲存)</translation>
- </message>
-</context>
-<context>
- <name>crop</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
- <source>Crop</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Crop filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Warning Cropping too much width ! Width reseted !
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Warning Cropping too much height ! Height reseted !
-</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>cropDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
- <source>Crop</source>
- <translation type="unfinished">剪裁</translation>
- </message>
- <message>
- <location line="+38"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
- <source>Right:</source>
- <translation type="unfinished">右:</translation>
- </message>
- <message>
- <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
- <source>Top:</source>
- <translation type="unfinished">頂部:</translation>
- </message>
- <message>
- <location line="+43"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
- <source>Reset</source>
- <translation type="unfinished">重設</translation>
- </message>
- <message>
- <location line="+21"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
- <source>Bottom:</source>
- <translation type="unfinished">底部:</translation>
- </message>
- <message>
- <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
- <source>Left:</source>
- <translation type="unfinished">左:</translation>
- </message>
- <message>
- <location line="+30"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
- <source>Auto Crop</source>
- <translation type="unfinished">自動剪裁</translation>
- </message>
-</context>
-<context>
- <name>dcaenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
- <source>_Bitrate:</source>
- <translation type="unfinished">位元率(_B):</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>DcaEnc Configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>decimate</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
- <source>Discard closer</source>
- <translation type="unfinished">丟棄較靠近的</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Replace (interpolate)</source>
- <translation type="unfinished">取代 (插入)</translation>
- </message>
- <message>
- <source>Discard longer dupe (animÃ©s)</source>
- <translation type="obsolete">丟棄 longer dupe (animés)</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Pulldown dupe removal</source>
- <translation type="unfinished">去除 Pulldown 偽裝</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Fastest (no chroma, partial luma)</source>
- <translation type="unfinished">最快 (沒有色度，部份的明度)</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Medium (full luma, no chroma)</source>
- <translation type="unfinished">中 (全部的明度，沒有色度)</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>_Mode:</source>
- <translation type="unfinished">模式(_M):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Quality:</source>
- <translation type="unfinished">品質(_Q):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Threshold 1:</source>
- <translation type="unfinished">臨界值 1(_T):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>T_hreshold 2:</source>
- <translation type="unfinished">臨界值 2(_H):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>C_ycle:</source>
- <translation type="unfinished">循環(_Y):</translation>
- </message>
- <message>
- <location line="-35"/>
- <source>Decomb decimate</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Donald Graft decimate. Remove duplicate after telecide.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+19"/>
- <source>Discard longer dupe (animés)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Sho_w</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Decomb Decimate</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>delogo</name>
- <message>
- <source>MPlayer delogo</source>
- <translation type="obsolete">Mplayer 去圖標</translation>
- </message>
- <message>
- <source>Blend a logo by interpolating its surrounding box.</source>
- <translation type="obsolete">利用插值它的包圍框來混合一個圖標。</translation>
- </message>
-</context>
-<context>
- <name>delogo2</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+42"/>
- <source>Blend a logo by interpolating its surrounding box.</source>
- <translation type="unfinished">利用插值它的包圍框來混合一個圖標。</translation>
- </message>
- <message>
- <location line="-1"/>
- <source>MPlayer delogo2</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>dgbob</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
- <source>Top</source>
- <translation type="unfinished">頂部</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bottom</source>
- <translation type="unfinished">底部</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Keep nb of frames and fps</source>
- <translation type="unfinished">保持畫格和 fps 的數目</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Double nb of frames and fps</source>
- <translation type="unfinished">兩倍畫格和 fps 的數目</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Double nb of frames (slow motion)</source>
- <translation type="unfinished">兩倍畫格的數量(慢動作)</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>_Mode:</source>
- <translation type="unfinished">模式(_M):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Threshold:</source>
- <translation type="unfinished">臨界值(_T):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Extra</source>
- <translation type="unfinished">額外(_E)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Extra check, avoid using it</source>
- <translation type="unfinished">額外檢查，避免正在使用它</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>DGBob</source>
- <translation type="unfinished">DGBob</translation>
- </message>
- <message>
- <location line="-27"/>
- <source>dgbob</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Donald Graft Bob.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>_Top Field First:</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>dmxHeader</name>
- <message>
- <source>Out of memory</source>
- <translation type="obsolete">記憶體外漏</translation>
- </message>
- <message>
- <source>Opening MPEG</source>
- <translation type="obsolete">正在開啟 MPRG</translation>
- </message>
- <message>
- <source>MPEG renumbering error</source>
- <translation type="obsolete">MPEG 重新編號錯誤</translation>
- </message>
-</context>
-<context>
- <name>dummy</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp" line="+44"/>
- <source>Dummy</source>
- <translation type="unfinished">虛擬</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Null filter, it does nothing at all.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>dv</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
- <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>encodingDialog</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
- <source>Encoding...</source>
- <translation type="unfinished">正在編碼...</translation>
- </message>
- <message>
- <location line="+57"/>
- <source>Phase:</source>
- <translation type="unfinished">階段:</translation>
- </message>
- <message>
- <location line="+223"/>
- <source>Video Codec:</source>
- <translation type="unfinished">視訊編解碼器:</translation>
- </message>
- <message>
- <location line="-236"/>
- <location line="+189"/>
- <location line="+24"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="-230"/>
- <location line="+223"/>
- <source>Unknown</source>
- <translation type="unfinished">未知</translation>
- </message>
- <message>
- <source>Container:</source>
- <translation type="obsolete">容器:</translation>
- </message>
- <message>
- <source>Audio Codec:</source>
- <translation type="obsolete">音訊編解碼器:</translation>
- </message>
- <message>
- <location line="+155"/>
- <location line="+37"/>
- <location line="+51"/>
- <source>0</source>
- <translation type="unfinished">0</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
- </message>
- <message>
- <source>Elapsed:</source>
- <translation type="obsolete">已過時間:</translation>
- </message>
- <message>
- <source>Time Remaining:</source>
- <translation type="obsolete">剩餘時間:</translation>
- </message>
- <message>
- <source>Frames/sec:</source>
- <translation type="obsolete">畫格/秒:</translation>
- </message>
- <message>
- <location line="-152"/>
- <location line="+7"/>
- <location line="+17"/>
- <source>0 MB</source>
- <translation type="unfinished">0 MB</translation>
- </message>
- <message>
- <source>Total Size:</source>
- <translation type="obsolete">總大小:</translation>
- </message>
- <message>
- <source>Audio Size:</source>
- <translation type="obsolete">音訊大小:</translation>
- </message>
- <message>
- <source>Video Size:</source>
- <translation type="obsolete">視訊大小:</translation>
- </message>
- <message>
- <source>Processed Frames:</source>
- <translation type="obsolete">已處理的畫格數:</translation>
- </message>
- <message>
- <source>Total Frames:</source>
- <translation type="obsolete">總畫格數:</translation>
- </message>
- <message>
- <location line="+77"/>
- <source>0 kB/s</source>
- <translation type="unfinished">0 kB/s</translation>
- </message>
- <message>
- <source>Average Bitrate:</source>
- <translation type="obsolete">平均位元率:</translation>
- </message>
- <message>
- <source>Quantiser:</source>
- <translation type="obsolete">量化值:</translation>
- </message>
- <message>
- <location line="-357"/>
- <source>Shut down computer when finished</source>
- <translation type="unfinished">完成時關閉電腦</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Priority:</source>
- <translation type="unfinished">優先權:</translation>
- </message>
- <message>
- <location line="+11"/>
- <source>High</source>
- <translation type="unfinished">高</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Above Normal</source>
- <translation type="unfinished">高於一般</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Normal</source>
- <translation type="unfinished">一般</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Below Normal</source>
- <translation type="unfinished">低於一般</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Low</source>
- <translation type="unfinished">低</translation>
- </message>
- <message>
- <location line="+45"/>
- <source>Pause / Abort</source>
- <translation type="unfinished">暫停 / 停止</translation>
- </message>
- <message>
- <location line="-158"/>
- <source>Main</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+48"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+90"/>
- <source>Minimize to Tray</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+33"/>
- <source>Advanced</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+53"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+50"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+47"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+51"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+24"/>
- <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>encodingWindow</name>
- <message>
- <source>Privileges Required</source>
- <translation type="obsolete">需要特殊權限</translation>
- </message>
- <message>
- <source>Root privileges are required to perform this operation.</source>
- <translation type="obsolete">需要 Root 權限來實行這項操作。</translation>
- </message>
- <message>
- <source>Pause / Abort</source>
- <translation type="obsolete">暫停 / 停止</translation>
- </message>
- <message>
- <source>The encoding is paused. Do you want to resume or abort?</source>
- <translation type="obsolete">編碼已經暫停。您要繼續或中止?</translation>
- </message>
- <message>
- <source>Resume</source>
- <translation type="obsolete">繼續</translation>
- </message>
- <message>
- <source>Abort</source>
- <translation type="obsolete">中止</translation>
- </message>
- <message>
- <source>Shutting down</source>
- <translation type="obsolete">正在關機</translation>
- </message>
-</context>
-<context>
- <name>eq2</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
- <source>MPlayer eq2</source>
- <translation type="unfinished">MPlayer eq2</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Adjust contrast, brightness, saturation and gamma.</source>
- <translation type="unfinished">調整對比、亮度、飽和度和伽馬。</translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
- <source>Reset</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>eq2Dialog</name>
- <message>
- <source>MPlayer eq2</source>
- <translation type="obsolete">MPlayer eq2</translation>
- </message>
- <message>
- <source>Gamma</source>
- <translation type="obsolete">伽馬</translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+232"/>
- <source>Green</source>
- <translation type="unfinished">綠</translation>
- </message>
- <message>
- <location line="-31"/>
- <source>Red</source>
- <translation type="unfinished">紅</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>Blue</source>
- <translation type="unfinished">藍</translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Weight</source>
- <translation type="unfinished">加重</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>Initial</source>
- <translation type="unfinished">初始</translation>
- </message>
- <message>
- <location line="-194"/>
- <location line="+88"/>
- <source>Contrast</source>
- <translation type="unfinished">對比</translation>
- </message>
- <message>
- <location line="-14"/>
- <source>Saturation</source>
- <translation type="unfinished">飽和度</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Brightness</source>
- <translation type="unfinished">亮度</translation>
- </message>
- <message>
- <location line="-44"/>
- <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>faac</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
- <source>_Bitrate:</source>
- <translation type="unfinished">位元率(_B):</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Faac Configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>fade</name>
- <message>
- <source>Fade</source>
- <translation type="obsolete">淡化</translation>
- </message>
- <message>
- <source>Fade in/out.</source>
- <translation type="obsolete">淡入/出。</translation>
- </message>
- <message>
- <source>Out</source>
- <translation type="obsolete">出</translation>
- </message>
- <message>
- <source>Fade out</source>
- <translation type="obsolete">淡出</translation>
- </message>
- <message>
- <source>In</source>
- <translation type="obsolete">入</translation>
- </message>
- <message>
- <source>Fade in</source>
- <translation type="obsolete">淡入</translation>
- </message>
- <message>
- <source>_Fade type:</source>
- <translation type="obsolete">淡化方式(_F):</translation>
- </message>
-</context>
-<context>
- <name>fade to</name>
- <message>
- <source>Fade</source>
- <translation type="obsolete">淡化</translation>
- </message>
-</context>
-<context>
- <name>fadeTo</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
- <location line="+24"/>
- <source>Fade</source>
- <translation type="unfinished">淡化</translation>
- </message>
- <message>
- <location line="-23"/>
- <source>Fade.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+19"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>fadeToBlack</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
- <location line="+26"/>
- <source>Fade to black</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-25"/>
- <source>Fade to black in/out.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Out</source>
- <translation type="unfinished">出</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Fade out</source>
- <translation type="unfinished">淡出</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>In</source>
- <translation type="unfinished">入</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Fade in</source>
- <translation type="unfinished">淡入</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>_Fade type:</source>
- <translation type="unfinished">淡化方式(_F):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Start time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_End time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>ffmpeg2</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+223"/>
- <source>Default</source>
- <translation type="unfinished">預設</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>KVCD</source>
- <translation type="unfinished">KVCD</translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Progressive</source>
- <translation type="unfinished">漸進的</translation>
- </message>
- <message>
- <location line="+15"/>
- <source>Threading</source>
- <translation type="unfinished">執行緒</translation>
- </message>
- <message>
- <location line="+36"/>
- <source>Interlacing</source>
- <translation type="unfinished">交錯</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Rate Control</source>
- <translation type="unfinished">比率控制</translation>
- </message>
- <message>
- <location line="-86"/>
- <source>Normal (4:3)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Wide (16:9)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Tmpgenc</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Animes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>MB comparison</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Fewest bits (vhq)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Rate distortion</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>One thread</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Two threads)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Three threads</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Auto (#cpu)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Interlaced</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Top Field First</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bottom Field First</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max. quantizer _difference:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>VBV Buffer Size:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max bitrate (kb/s):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Number of B frames:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>_Macroblock decision:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Aspect ratio:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Matrices:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Filesize tolerance (kb):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Quantizer compression:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Quantizer _blur:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Gop Size:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Interlaced:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Field Order:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Basic Settings</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Adv. Settings</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>libavcodec MPEG-2 configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>ffmpeg4</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Full</source>
- <translation type="unfinished">全部</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Log</source>
- <translation type="unfinished">Log</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>EPZS</source>
- <translation type="unfinished">EPZS</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>H.263</source>
- <translation type="unfinished">H.263</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
- </message>
- <message>
- <location line="+23"/>
- <source>Threading</source>
- <translation type="unfinished">執行緒</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>User Interface</source>
- <translation type="unfinished">使用介面</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Motion Estimation</source>
- <translation type="unfinished">動作估測</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Rate Control</source>
- <translation type="unfinished">比率控制</translation>
- </message>
- <message>
- <location line="-74"/>
- <source>Phods</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>X1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>MB comparison</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Fewest bits (vhq)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Rate distortion</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>One thread</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Two threads)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Three threads</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Auto (#cpu)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Matrices</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max. quantizer _difference:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>4_MV</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Quarter pixel</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_GMC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>_Number of B frames:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Quantization type:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Macroblock decision:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Filesize tolerance (kb):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Quantizer compression:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Quantizer _blur:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Gop Size:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Advanced Simple Profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>libavcodec MPEG-4 configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>ffmsmpeg4</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+224"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Full</source>
- <translation type="unfinished">全部</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Log</source>
- <translation type="unfinished">Log</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>EPZS</source>
- <translation type="unfinished">EPZS</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>H.263</source>
- <translation type="unfinished">H.263</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
- </message>
- <message>
- <location line="+27"/>
- <source>User Interface</source>
- <translation type="unfinished">使用介面</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Rate Control</source>
- <translation type="unfinished">比率控制</translation>
- </message>
- <message>
- <location line="-44"/>
- <source>Phods</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>X1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>MB comparison</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Fewest bits (vhq)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Rate distortion</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max. quantizer _difference:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Filesize tolerance (kb):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Quantizer compression:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Quantizer _blur:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Gop Size:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>libavcodec MPEG-4 configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>ffnvenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
- <source>Low Quality</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
- <source>High Quality</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
- <source>BluRay</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
- <source>Low Latency</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
- <source>Low Latency (LQ)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
- <source>Low Latency (HQ)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
- <source>Preset:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>NVENC H.264 configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
- <source>libavcodec MPEG-4 configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
- <source>nvEnc HEVC configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>ffpsmuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+64"/>
- <source>[Mismatch]</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+78"/>
- <source>Saving mpeg PS (ff)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <source> video not compatible
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source> Bad width/height for VCD
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source> Bad width/height for SVCD
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source> Bad width/height for DVD
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+17"/>
- <source> VCD : only MP2 audio accepted
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source> VCD : only 44.1 khz audio accepted
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source> DVD : only 48 khz audio accepted
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
- <source>Free</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Muxing Format</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Allow non compliant stream</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Total Muxrate (kbits)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Video Muxrate (kbits)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>VBV size (kBytes)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Advanced</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Mpeg PS Muxer</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>fftsmuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
- <source>Saving mpeg TS (ff)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+28"/>
- <source>VBR muxing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Mux rate (MBits/s)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>TS Muxer</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>filesel</name>
- <message>
- <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
- <source>File error</source>
- <translation type="unfinished">檔案錯誤</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Cannot open &quot;%s&quot;.</source>
- <translation type="unfinished">無法開啟 &quot;%s&quot;。</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>%s already exists.
-
-Do you want to replace it?</source>
- <translation type="unfinished">%s 已存在。
-
-要覆蓋它嗎?</translation>
- </message>
- <message>
- <location line="+27"/>
- <location line="+14"/>
- <source>It is possible that you are trying to overwrite an input file!</source>
- <translation type="unfinished">你可能嘗試覆寫一個輸入檔!</translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Cannot write the file</source>
- <translation type="unfinished">無法寫入檔案</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>No write access to &quot;%s&quot;.</source>
- <translation type="unfinished">沒有任何寫入動作存取到 &quot;%s&quot;。</translation>
- </message>
-</context>
-<context>
- <name>filtermainWindow</name>
- <message>
- <source>The filter is already partial</source>
- <translation type="obsolete">此濾鏡已經是區段性</translation>
- </message>
- <message>
- <source>Load set of filters</source>
- <translation type="obsolete">載入濾鏡設定</translation>
- </message>
- <message>
- <source>Nothing to save</source>
- <translation type="obsolete">沒有任何改變可儲存</translation>
- </message>
- <message>
- <source>Save set of filters</source>
- <translation type="obsolete">儲存濾鏡設定</translation>
- </message>
- <message>
- <source>Partial Start Frame:</source>
- <translation type="obsolete">區段起始畫格:</translation>
- </message>
- <message>
- <source>Partial End Frame:</source>
- <translation type="obsolete">區段結束畫格:</translation>
- </message>
- <message>
- <source>Configure child</source>
- <translation type="obsolete">設定子項目</translation>
- </message>
- <message>
- <source>Partial Video Filter</source>
- <translation type="obsolete">區段性視訊濾鏡</translation>
- </message>
-</context>
-<context>
- <name>flux</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
- <source>Spatio-temporal cleaner by Ross Thomas.</source>
- <translation type="unfinished">空間-時間清理器，作者為 Ross Thomas。</translation>
- </message>
- <message>
- <location line="+50"/>
- <source>_Temporal threshold:</source>
- <translation type="unfinished">時間臨界值(_T):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Spatial threshold:</source>
- <translation type="unfinished">空間臨界值(_S):</translation>
- </message>
- <message>
- <location line="-52"/>
- <location line="+56"/>
- <source>FluxSmooth</source>
- <translation type="unfinished">融熔平滑</translation>
- </message>
-</context>
-<context>
- <name>flv1</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+162"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Full</source>
- <translation type="unfinished">全部</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Log</source>
- <translation type="unfinished">Log</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>EPZS</source>
- <translation type="unfinished">EPZS</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>H.263</source>
- <translation type="unfinished">H.263</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
- </message>
- <message>
- <location line="+27"/>
- <source>User Interface</source>
- <translation type="unfinished">使用介面</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Rate Control</source>
- <translation type="unfinished">比率控制</translation>
- </message>
- <message>
- <location line="-44"/>
- <source>Phods</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>X1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>MB comparison</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Fewest bits (vhq)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Rate distortion</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max. quantizer _difference:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Filesize tolerance (kb):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Quantizer compression:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Quantizer _blur:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Gop Size:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Quantization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>libavcodec FLV1 configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>flvdemuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
- <source>Warning</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>This FLV file says it has no video.
-I will assume it has and try to continue</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>flvmuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp" line="+68"/>
- <location line="+10"/>
- <location line="+6"/>
- <source>Unsupported</source>
- <translation type="unfinished">未支援的</translation>
- </message>
- <message>
- <location line="-16"/>
- <source>Only FLV1 &amp; VP6 supported for video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Only AAC &amp; mpegaudio supported for audio</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>gaussian</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+26"/>
- <source>Gaussian convolution.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>3x3 convolution filter :gaussian.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glBenchmark</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
- <source>OpenGl ReadBack benchmark</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Check how fast readback is.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glFragment</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+68"/>
- <source>OpenGl Fragment Shader Sample</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Run a fragment shader.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glFragment2</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+66"/>
- <source>OpenGl Fragment Shader Sample2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Run a fragment shader.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glResize</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+66"/>
- <source>OpenGl Resize</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Resize using openGl.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+146"/>
- <source>Width :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Height :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>glResize</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glRotate</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+57"/>
- <source>OpenGl Rotate</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Rotate image by a small amount.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+118"/>
- <source>Angle (°):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>glRotate</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glSample</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+68"/>
- <source>OpenGl Fragment Shader Sample</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Run a fragment shader.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glShader</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-182"/>
- <source>Shader Loader</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Run an external shader program.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+192"/>
- <source>ShaderFile to load</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>ShaderLoader</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glSmooth</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp" line="+61"/>
- <source>OpenGl Smooth</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Smooth image while preserving edge.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glVdpaufilter</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+84"/>
- <source>vdpauDeintGl</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+178"/>
- <source>Keep Top Field</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Keep Bottom Field</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Double framerate</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>_Resize:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Deint Mode:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Width :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Height :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>vdpau</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glVertex</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+59"/>
- <source>OpenGl Vertex Shader</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Run a simple vertex shader.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glWave</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp" line="+59"/>
- <source>OpenGl wave </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Simple wave filter.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>glYadif</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+260"/>
- <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">時間 &amp; 空間檢查</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">上下來回，時間 &amp; 空間檢查</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Skip spatial temporal check</source>
- <translation type="unfinished">略過空間時間檢查</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">上下來回，略過空間時間檢查</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>_Mode:</source>
- <translation type="unfinished">模式(_M):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Order:</source>
- <translation type="unfinished">命令(_O):</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>yadif</source>
- <translation type="unfinished">yadif</translation>
- </message>
- <message>
- <location line="-198"/>
- <source>Yadif (openGl)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Yet another deinterlacer, using shaders.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+188"/>
- <source>Bottom field first</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Top field first</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>h263Header</name>
- <message>
- <source>Size is not (s)QCIF</source>
- <translation type="obsolete">大小不是 (s)QCIF</translation>
- </message>
-</context>
-<context>
- <name>hflip</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
- <source>Horizontal Flip</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Horizontally flip the image.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>histogram</name>
- <message>
- <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+56"/>
- <location line="+75"/>
- <source>No data</source>
- <translation type="unfinished">沒有資料</translation>
- </message>
- <message>
- <location line="+71"/>
- <source>Max. bitrate:</source>
- <translation type="unfinished">最大位元率:</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Average bitrate:</source>
- <translation type="unfinished">平均位元率:</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Number of I frames:</source>
- <translation type="unfinished">I 畫格數目:</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Number of P frames:</source>
- <translation type="unfinished">P 畫格數目:</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Number of B frames:</source>
- <translation type="unfinished">B 畫格數目:</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max. B frames:</source>
- <translation type="unfinished">最大 B 畫格數:</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Bitrate Histogram</source>
- <translation type="unfinished">位元率分佈圖</translation>
- </message>
-</context>
-<context>
- <name>hue</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
- <source>Adjust hue and saturation.</source>
- <translation type="unfinished">調整色相和飽和度。</translation>
- </message>
- <message>
- <location line="-1"/>
- <source>Mplayer Hue</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>hueDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui" line="+14"/>
- <location line="+45"/>
- <source>Hue</source>
- <translation type="unfinished">色相</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Saturation</source>
- <translation type="unfinished">飽和度</translation>
- </message>
-</context>
-<context>
- <name>huff</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
- <source>HUFFYUV</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>FF HUFFYUV</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Type:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>HuffYUV Configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>hzstackfield</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
- <source>Horizontal Stack Fields</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Put fields side by side.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>indexing</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
- <source>Continue indexing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Abort Requested</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to abort indexing ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+76"/>
- <source>Time Left :%02d:%02d:%02d</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>ivtcRemover</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
- <source>Remove IVTC dupe.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Remove the duplicate frames present after ivtc.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
- <source>_Noise:</source>
- <translation type="unfinished">雜訊(_N):</translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
- <source>_Show:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Remove duplicate:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
- <source>Full</source>
- <translation type="unfinished">全部</translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
- <source>Fast</source>
- <translation type="unfinished">快</translation>
- </message>
- <message>
- <location line="+1"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
- <source>VeryFast</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
- <source>_Frame rate change:</source>
- <translation type="unfinished">畫格率改變(_F):</translation>
- </message>
- <message>
- <location line="+3"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
- <source>DupeRemover</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>jobs</name>
- <message>
- <location filename="../../common/GUI_jobs.cpp" line="+37"/>
- <source>Oops</source>
- <translation type="unfinished">Oops</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Something very wrong happened when building joblist.</source>
- <translation type="unfinished">建立工作列表時發生某些重大錯誤。</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>There are no jobs stored</source>
- <translation type="unfinished">沒有儲存任何工作</translation>
- </message>
- <message>
- <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
- <source>Avidemux Jobs</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Run all pending jobs</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Run jobs</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Delete already executed jobs</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Cleanup</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>If you use VDPAU you cannot use CLI version</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>use QT4 version</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Quit</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>jobsDialog</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
- <source>Jobs</source>
- <translation type="unfinished">工作</translation>
- </message>
- <message>
- <location line="+37"/>
- <source>Delete Sel. Job</source>
- <translation type="unfinished">刪除選擇的工作</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Delete All Jobs</source>
- <translation type="unfinished">刪除所有工作</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Run All Jobs</source>
- <translation type="unfinished">執行所有工作</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Run Selected Job</source>
- <translation type="unfinished">執行選擇的工作</translation>
- </message>
-</context>
-<context>
- <name>jobsWindow</name>
- <message>
- <source>Job Name</source>
- <translation type="obsolete">工作名稱</translation>
- </message>
- <message>
- <source>Status</source>
- <translation type="obsolete">狀態</translation>
- </message>
- <message>
- <source>Start Time</source>
- <translation type="obsolete">起始時間</translation>
- </message>
- <message>
- <source>End Time</source>
- <translation type="obsolete">終了時間</translation>
- </message>
- <message>
- <source>Sure!</source>
- <translation type="obsolete">確定!</translation>
- </message>
- <message>
- <source>Delete job</source>
- <translation type="obsolete">刪除工作</translation>
- </message>
- <message>
- <source>Are you sure you want to delete %s job?</source>
- <translation type="obsolete">確定要刪除 %s 工作?</translation>
- </message>
- <message>
- <source>Delete *all* job</source>
- <translation type="obsolete">刪除*所有*工作</translation>
- </message>
- <message>
- <source>Are you sure you want to delete ALL jobs?</source>
- <translation type="obsolete">確定要刪除所有工作?</translation>
- </message>
- <message>
- <source>Already done</source>
- <translation type="obsolete">已經完成</translation>
- </message>
- <message>
- <source>This script has already been successfully executed.</source>
- <translation type="obsolete">這個腳本已經成功執行。</translation>
- </message>
- <message>
- <source>Ready</source>
- <translation type="obsolete">準備</translation>
- </message>
- <message>
- <source>Succeeded</source>
- <translation type="obsolete">已成功</translation>
- </message>
- <message>
- <source>Failed</source>
- <translation type="obsolete">已失敗</translation>
- </message>
- <message>
- <source>Deleted</source>
- <translation type="obsolete">已刪除</translation>
- </message>
- <message>
- <source>Running</source>
- <translation type="obsolete">正在執行</translation>
- </message>
-</context>
-<context>
- <name>jpeg</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
- <source>_Quantizer:</source>
- <translation type="unfinished">量化值(_Q):</translation>
- </message>
- <message>
- <location line="-12"/>
- <source>YUV422</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>YUV420</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>_ColorSpace:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Mjpeg Configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>kernelDeint</name>
- <message>
- <source>Top</source>
- <translation type="obsolete">頂部</translation>
- </message>
- <message>
- <source>Bottom</source>
- <translation type="obsolete">底部</translation>
- </message>
- <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
- </message>
- <message>
- <source>Smaller means more deinterlacing</source>
- <translation type="obsolete">越小表示更多的去交錯</translation>
- </message>
- <message>
- <source>_Sharp</source>
- <translation type="obsolete">銳利(_S)</translation>
- </message>
- <message>
- <source>_Sharper engine:</source>
- <translation type="obsolete">清晰化引擎(_S):</translation>
- </message>
- <message>
- <source>T_woway</source>
- <translation type="obsolete">雙向(_W)</translation>
- </message>
- <message>
- <source>Extrapolate better (better not to use it)</source>
- <translation type="obsolete">推算較好的 (最好不使用它)</translation>
- </message>
- <message>
- <source>_Map</source>
- <translation type="obsolete">對應(_M)</translation>
- </message>
- <message>
- <source>Show interlaced areas (for test!)</source>
- <translation type="obsolete">顯示交錯的範圍(測試用！)</translation>
- </message>
- <message>
- <source>KernelDeint</source>
- <translation type="obsolete">KernelDeint</translation>
- </message>
-</context>
-<context>
- <name>kerneldeint</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="+65"/>
- <source>Top</source>
- <translation type="unfinished">頂部</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bottom</source>
- <translation type="unfinished">底部</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>_Threshold:</source>
- <translation type="unfinished">臨界值(_T):</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Smaller means more deinterlacing</source>
- <translation type="unfinished">越小表示更多的去交錯</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Sharp</source>
- <translation type="unfinished">銳利(_S)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>_Sharper engine:</source>
- <translation type="unfinished">清晰化引擎(_S):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>T_woway</source>
- <translation type="unfinished">雙向(_W)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Extrapolate better (better not to use it)</source>
- <translation type="unfinished">推算較好的 (最好不使用它)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Map</source>
- <translation type="unfinished">對應(_M)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Show interlaced areas (for test!)</source>
- <translation type="unfinished">顯示交錯的範圍(測試用！)</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>KernelDeint</source>
- <translation type="unfinished">KernelDeint</translation>
- </message>
- <message>
- <location line="-28"/>
- <source>Kernel Deint.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Port of Donald Graft Kernel Deinterlacer.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+19"/>
- <source>_Field order:</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>lame</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+310"/>
- <source>CBR</source>
- <translation type="unfinished">CBR</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>ABR</source>
- <translation type="unfinished">ABR</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Bit_rate mode:</source>
- <translation type="unfinished">位元率模式(_R):</translation>
- </message>
- <message>
- <location line="+18"/>
- <source>_Bitrate:</source>
- <translation type="unfinished">位元率(_B):</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Quality:</source>
- <translation type="unfinished">品質(_Q):</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>LAME Configuration</source>
- <translation type="unfinished">LAME 設定</translation>
- </message>
- <message>
- <location line="-4"/>
- <source>_Disable reservoir:</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>largeMedian</name>
- <message>
- <source>_Process luma</source>
- <translation type="obsolete">處理明度(_P)</translation>
- </message>
- <message>
- <source>Process luma plane</source>
- <translation type="obsolete">處理明度平面</translation>
- </message>
- <message>
- <source>P_rocess chroma</source>
- <translation type="obsolete">處理色度(_R)</translation>
- </message>
- <message>
- <source>Fast Convolution</source>
- <translation type="obsolete">快速卷積</translation>
- </message>
-</context>
-<context>
- <name>largemedian</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+71"/>
- <source>_Process luma</source>
- <translation type="unfinished">處理明度(_P)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Process luma plane</source>
- <translation type="unfinished">處理明度平面</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>P_rocess chroma</source>
- <translation type="unfinished">處理色度(_R)</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Fast Convolution</source>
- <translation type="unfinished">快速卷積</translation>
- </message>
- <message>
- <location line="-40"/>
- <source>Large Median (5x5).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Median filter on 5x5 matrix.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>lavDeint</name>
- <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
- </message>
- <message>
- <source>Linear blend</source>
- <translation type="obsolete">線性混合</translation>
- </message>
- <message>
- <source>Linear interpolate</source>
- <translation type="obsolete">線性插值</translation>
- </message>
- <message>
- <source>Cubic interpolate</source>
- <translation type="obsolete">立方插值</translation>
- </message>
- <message>
- <source>Median interpolate</source>
- <translation type="obsolete">中位插值</translation>
- </message>
- <message>
- <source>FFmpeg deint</source>
- <translation type="obsolete">FFmpeg deint</translation>
- </message>
- <message>
- <source>_Deinterlacing:</source>
- <translation type="obsolete">去交錯(_D):</translation>
- </message>
- <message>
- <source>_Autolevel</source>
- <translation type="obsolete">自動色階(_A)</translation>
- </message>
- <message>
- <source>libavcodec deinterlacer</source>
- <translation type="obsolete">libavcodec 去交錯器</translation>
- </message>
-</context>
-<context>
- <name>lavMuxer</name>
- <message>
- <source>Incompatible frame rate</source>
- <translation type="obsolete">不相容的畫格率</translation>
- </message>
-</context>
-<context>
- <name>lavcodec</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
- <source>_Bitrate:</source>
- <translation type="unfinished">位元率(_B):</translation>
- </message>
-</context>
-<context>
- <name>lavdecoder</name>
- <message>
- <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
- <source>_Swap U and V</source>
- <translation type="unfinished">置換 U 和 V(_S)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Show motion _vectors</source>
- <translation type="unfinished">顯示動作向量(_V)</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Decoder Options</source>
- <translation type="unfinished">解碼器選項</translation>
- </message>
-</context>
-<context>
- <name>lavdeint</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+188"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Linear blend</source>
- <translation type="unfinished">線性混合</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Linear interpolate</source>
- <translation type="unfinished">線性插值</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Cubic interpolate</source>
- <translation type="unfinished">立方插值</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Median interpolate</source>
- <translation type="unfinished">中位插值</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>FFmpeg deint</source>
- <translation type="unfinished">FFmpeg deint</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>_Deinterlacing:</source>
- <translation type="unfinished">去交錯(_D):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Autolevel</source>
- <translation type="unfinished">自動色階(_A)</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>libavcodec deinterlacer</source>
- <translation type="unfinished">libavcodec 去交錯器</translation>
- </message>
- <message>
- <location line="-131"/>
- <source>Libavdec Deinterlacers</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Lavcodec deinterlacer family.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>licenseDialog</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
- <source>License</source>
- <translation type="unfinished">授權</translation>
- </message>
- <message>
- <location line="+46"/>
- <source>OK</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>logo</name>
- <message>
- <source>_Logo (jpg file):</source>
- <translation type="obsolete">圖標(_L)(jpg 檔):</translation>
- </message>
- <message>
- <source>Select JPEG file</source>
- <translation type="obsolete">選擇 JPEG 檔案</translation>
- </message>
- <message>
- <source>_X Position:</source>
- <translation type="obsolete">_X 位置:</translation>
- </message>
- <message>
- <source>_Y Position:</source>
- <translation type="obsolete">_Y 位置:</translation>
- </message>
- <message>
- <source>_Alpha:</source>
- <translation type="obsolete">_Alpha:</translation>
- </message>
- <message>
- <source>Logo</source>
- <translation type="obsolete">圖標</translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+22"/>
- <source>Add logo</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Put a logo on top of video, with alpha blending.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
- <source>Select Logo Image</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>logoDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+14"/>
- <source>Logo</source>
- <translation type="unfinished">圖標</translation>
- </message>
- <message>
- <location line="+10"/>
- <location line="+7"/>
- <source>Image</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Select</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+26"/>
- <source>X</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Y</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Alpha</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+65"/>
- <source>You can click in the image to set the logo approximatively</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>lumaonly</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
- <source>GreyScale</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Remove color, only key grey image.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mainFilterDialog</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+20"/>
- <source>Video Filter Manager</source>
- <translation type="unfinished">視訊濾鏡管理器</translation>
- </message>
- <message>
- <location line="+180"/>
- <source>Transform</source>
- <translation type="unfinished">變形</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Interlacing</source>
- <translation type="unfinished">交錯</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Colors</source>
- <translation type="unfinished">色彩</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Noise</source>
- <translation type="unfinished">雜訊</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Sharpness</source>
- <translation type="unfinished">銳利</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Subtitles</source>
- <translation type="unfinished">字幕</translation>
- </message>
- <message>
- <location line="+18"/>
- <source>Miscellaneous</source>
- <translation type="unfinished">其他</translation>
- </message>
- <message>
- <source>External</source>
- <translation type="obsolete">外部的</translation>
- </message>
- <message>
- <location line="-182"/>
- <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
- <translation type="unfinished">&lt;big&gt;&lt;b&gt;作用中的濾鏡&lt;/b&gt;&lt;/big&gt;</translation>
- </message>
- <message>
- <source>C&amp;onfigure</source>
- <translation type="obsolete">設定(&amp;O)</translation>
- </message>
- <message>
- <source>P&amp;artial</source>
- <translation type="obsolete">局部性(&amp;A)</translation>
- </message>
- <message>
- <source>Open Script</source>
- <translation type="obsolete">開啟腳本</translation>
- </message>
- <message>
- <source>Load</source>
- <translation type="obsolete">載入</translation>
- </message>
- <message>
- <source>Save Script As</source>
- <translation type="obsolete">另存腳本為</translation>
- </message>
- <message>
- <source>Save Script</source>
- <translation type="obsolete">儲存腳本</translation>
- </message>
- <message>
- <source>Move Filter Down</source>
- <translation type="obsolete">下移濾鏡</translation>
- </message>
- <message>
- <source>Down</source>
- <translation type="obsolete">↓</translation>
- </message>
- <message>
- <source>Move Filter Up</source>
- <translation type="obsolete">上移濾鏡</translation>
- </message>
- <message>
- <source>Up</source>
- <translation type="obsolete">↑</translation>
- </message>
- <message>
- <source>Remove Filter</source>
- <translation type="obsolete">移除濾鏡</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation type="obsolete">移除</translation>
- </message>
- <message>
- <source>Add Filter</source>
- <translation type="obsolete">加入濾鏡</translation>
- </message>
- <message>
- <source>Add</source>
- <translation type="obsolete">加入</translation>
- </message>
- <message>
- <location line="+78"/>
- <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
- <translation type="unfinished">&lt;big&gt;&lt;b&gt;可用的濾鏡&lt;/b&gt;&lt;/big&gt;</translation>
- </message>
- <message>
- <location line="+155"/>
- <source>&amp;Preview</source>
- <translation type="unfinished">預覽(&amp;P)</translation>
- </message>
- <message>
- <location line="+11"/>
- <source>&amp;Close</source>
- <translation type="unfinished">關閉(&amp;C)</translation>
- </message>
- <message>
- <location line="-71"/>
- <source>OpenGl</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mainMenu</name>
- <message>
- <source>Close</source>
- <translation type="obsolete">關閉</translation>
- </message>
- <message>
- <source>Connect to avsproxy</source>
- <translation type="obsolete">連線至 avsproxy</translation>
- </message>
- <message>
- <source>Copy</source>
- <translation type="obsolete">複製</translation>
- </message>
- <message>
- <source>Delete</source>
- <translation type="obsolete">刪除</translation>
- </message>
- <message>
- <source>Set Marker A</source>
- <translation type="obsolete">設定標記 A</translation>
- </message>
- <message>
- <source>Set Marker B</source>
- <translation type="obsolete">設定標記 B</translation>
- </message>
- <message>
- <source>Preferences</source>
- <translation type="obsolete">偏好設定</translation>
- </message>
- <message>
- <source>Filters</source>
- <translation type="obsolete">濾鏡</translation>
- </message>
- <message>
- <source>Play/Stop</source>
- <translation type="obsolete">播放/停止</translation>
- </message>
- <message>
- <source>Previous Intra Frame</source>
- <translation type="obsolete">上一個內部畫格</translation>
- </message>
- <message>
- <source>Next Intra Frame</source>
- <translation type="obsolete">上一個內部畫格</translation>
- </message>
- <message>
- <source>Previous Black Frame</source>
- <translation type="obsolete">上一個黑畫面</translation>
- </message>
- <message>
- <source>Next Black Frame</source>
- <translation type="obsolete">下一個黑畫面</translation>
- </message>
-</context>
-<context>
- <name>matroskademuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
- <source>Matroska Images</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+426"/>
- <source>Matroska clusters</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mcdeint</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+82"/>
- <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
- <translation type="unfinished">從 MPlayer 移植的動作補償去交錯器。</translation>
- </message>
- <message>
- <location line="+38"/>
- <source>Fast</source>
- <translation type="unfinished">快</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Medium</source>
- <translation type="unfinished">中</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Slow iterative motion search</source>
- <translation type="unfinished">緩慢反覆的動作搜尋</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Extra slow (same as 3+multiple reference frames)</source>
- <translation type="unfinished">特別慢 (同於3或3倍數以上的參考畫格數)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>_Mode:</source>
- <translation type="unfinished">模式(_M):</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Qp:</source>
- <translation type="unfinished">_Qp:</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>mcDeinterlace</source>
- <translation type="unfinished">mcDeinterlace</translation>
- </message>
- <message>
- <location line="-51"/>
- <source>MCDeint</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+46"/>
- <source>Bottom :</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mean</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
- <source>Mean convolution.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>3x3 convolution filter :mean.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>median</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+28"/>
- <source>Median convolution.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>3x3 convolution filter :median.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mergeFields</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
- <source>Merge Fields</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Merge two pictures as if they were two fields.</source>
- <translation type="unfinished">合併兩個圖像就像是兩個圖場一樣。</translation>
- </message>
-</context>
-<context>
- <name>mkvmuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
- <source>Saving Mkv</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
- <source>Force display width</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Display width</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>MKV Muxer</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mp3d</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
- <source>_Spatial luma strength:</source>
- <translation type="unfinished">空間的明度強度(_S):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>S_patial chroma strength:</source>
- <translation type="unfinished">空間的色度強度(_P):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Temporal luma strength:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>T_emporal chroma strength:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>MPlayer Denoise 3D HQ</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>MPlayer denoise3d</source>
- <translation type="obsolete">MPlayer denoise3d</translation>
- </message>
- <message>
- <location line="-40"/>
- <source>Mplayer Denoise 3D HQ</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mp3dlow</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="+37"/>
- <source>Reduce noise, smooth image, increase compressibility.</source>
- <translation type="unfinished">減少雜訊、平滑圖像、增加壓縮率。</translation>
- </message>
- <message>
- <location line="+32"/>
- <source>_Spatial luma strength:</source>
- <translation type="unfinished">空間的明度強度(_S):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>S_patial chroma strength:</source>
- <translation type="unfinished">空間的色度強度(_P):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Temporal strength:</source>
- <translation type="unfinished">時間強度(_T):</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>MPlayer Denoise 3D</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>MPlayer denoise3d</source>
- <translation type="obsolete">MPlayer denoise3d</translation>
- </message>
- <message>
- <location line="-39"/>
- <source>Mplayer Denoise 3D</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mp4demuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
- <source>Problem reading SVQ3 headers</source>
- <translation type="unfinished">讀取 SVQ3 檔頭時發生問題</translation>
- </message>
- <message>
- <source>No stts table</source>
- <translation type="obsolete">沒有 stts 表</translation>
- </message>
-</context>
-<context>
- <name>mp4muxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
- <location line="+9"/>
- <source>Unsupported</source>
- <translation type="unfinished">未支援的</translation>
- </message>
- <message>
- <location line="-9"/>
- <source>Only MP4Video, H264, and H265 supported for video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+81"/>
- <source>Saving mp4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Saving PSP</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
- <source>Muxing Format</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Use alternate MP3 tag</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>MP4 Muxer</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>mp4v2muxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
- <source>Audio</source>
- <translation type="unfinished">音訊</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Audio format not supported, only AAC/MP3/AC3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+46"/>
- <source>Saving</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Video</source>
- <translation type="unfinished">視訊</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Video does not have enough timing information. Are you copying from AVI?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+65"/>
- <source>Cannot rename file (optimize)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+53"/>
- <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+19"/>
- <source>Invalid bitrate for AC3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Invalid number of channels for AC3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+48"/>
- <source>Cannot get AAC Extra data
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
- <source>Optimize for streaming (SLOW)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Add ipod metadata</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>MP4V2 Settings</source>
- <translation type="unfinished"></translation>
+ <source>Split each image into 2 fields.</source>
+ <translation>分割兩個圖像，它會加倍的幀率，兩倍數量的圖像，和減半垂直解析度。</translation>
 </message>
 </context>
 <context>
- <name>mpdelogoDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+14"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+14"/>
- <source>Mplayer Delogo</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+32"/>
- <source>X</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+37"/>
- <source>Y</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+23"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-17"/>
- <source>Width</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+7"/>
- <source>Height</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-14"/>
- <source>Border Width</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+50"/>
- <source>Preview. Click in the image above to coarsly set the box coordinates</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+59"/>
- <source>You can resize the red rectangle using the grips </source>
- <translation type="unfinished"></translation>
- </message>
+ <name>shaderLoader</name>
 <message>
- <location line="+58"/>
- <source>Preview</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+194"/>
+ <source>Reload shader</source>
+ <translation>重新載入著色器</translation>
 </message>
 </context>
 <context>
- <name>msharpen</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
- <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
- <translation type="unfinished">沒有放大雜訊下銳利化邊緣。作者為 Donald Graft。</translation>
- </message>
- <message>
- <source>_Mask</source>
- <translation type="obsolete">遮罩(_M)</translation>
- </message>
- <message>
- <source>_High Q</source>
- <translation type="obsolete">高 Q(_H)</translation>
- </message>
- <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
- </message>
- <message>
- <source>_Strength:</source>
- <translation type="obsolete">強度(_S):</translation>
- </message>
+ <name>sharpen</name>
 <message>
- <source>MSharpen</source>
- <translation type="obsolete">MSharpen</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+28"/>
+ <source>3x3 convolution filter :sharpen.</source>
+ <translation>3 x 3 卷積濾鏡： 銳化。</translation>
 </message>
 <message>
 <location line="-1"/>
- <source>Msharpen</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>msharpenDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+14"/>
- <source>MSharpen</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+63"/>
- <source>Mask</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+37"/>
- <source>Strength</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Threshold</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>HighQuality</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>navigate</name>
- <message>
- <location filename="../../common/gui_navigate.cpp" line="+244"/>
- <source>Cannot go to next keyframe</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
- <source>Cannot go to previous keyframe</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+192"/>
- <source>Seek</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+65"/>
- <source>Error</source>
- <translation type="unfinished">錯誤</translation>
- </message>
-</context>
-<context>
- <name>nuvHeader</name>
- <message>
- <source>Opening Nuppel video</source>
- <translation type="obsolete">正在開啟 Nuppel 視訊</translation>
- </message>
- <message>
- <source>Sure you want to abort ?</source>
- <translation type="obsolete">確定要中止?</translation>
- </message>
- <message>
- <source>Size mismatch</source>
- <translation type="obsolete">大小不相符</translation>
- </message>
- <message>
- <source>Expect a crash.</source>
- <translation type="obsolete">預期的不正常關閉。</translation>
- </message>
- <message>
- <source>Do you want to save an index ?</source>
- <translation type="obsolete">要儲存索引嗎?</translation>
- </message>
-</context>
-<context>
- <name>nvenc</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+136"/>
- <source>Low Quality</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>High Quality</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>BluRay</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Low Latency</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Low Latency (LQ)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Low Latency (HQ)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Preset:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Nvidia H264 Encoder configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>oggHeader</name>
- <message>
- <source>Take second track ?</source>
- <translation type="obsolete">提取第二軌道?</translation>
- </message>
- <message>
- <source>Scanning OGM</source>
- <translation type="obsolete">正在掃描 OGM</translation>
- </message>
-</context>
-<context>
- <name>opendmldemuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
- <location line="+76"/>
- <location line="+263"/>
- <source>Malformed header</source>
- <translation type="unfinished">不正常的標頭</translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
- <source>Unpacking bitstream</source>
- <translation type="unfinished">拆開打包的位元流</translation>
- </message>
-</context>
-<context>
- <name>partial</name>
- <message>
- <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
- <source>Start time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>End time (ms):</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Configure filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Partial Filter</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>previewDialog</name>
- <message>
- <source>Preview</source>
- <translation type="obsolete">預覽</translation>
- </message>
-</context>
-<context>
- <name>printinfo</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
- <source>PrintInfo</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Display some informations on Screen.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>propWindow</name>
- <message>
- <source>Mono</source>
- <translation type="obsolete">單音</translation>
- </message>
- <message>
- <source>Stereo</source>
- <translation type="obsolete">立體聲</translation>
- </message>
- <message>
- <source>No</source>
- <translation type="obsolete">否</translation>
- </message>
- <message>
- <source>Yes</source>
- <translation type="obsolete">是</translation>
- </message>
-</context>
-<context>
- <name>propsDialog</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+14"/>
- <source>Properties</source>
- <translation type="unfinished">屬性</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Video</source>
- <translation type="unfinished">視訊</translation>
- </message>
- <message>
- <location line="+24"/>
- <location line="+14"/>
- <location line="+14"/>
- <location line="+14"/>
- <location line="+14"/>
- <source>TextLabel</source>
- <translation type="unfinished">文字標籤</translation>
- </message>
- <message>
- <location line="-49"/>
- <source>Frame Rate:</source>
- <translation type="unfinished">畫格率:</translation>
- </message>
- <message>
- <source>Frame Count: </source>
- <translation type="obsolete">畫格總計: </translation>
- </message>
- <message>
- <location line="+14"/>
- <location line="+135"/>
- <source>Total Duration:</source>
- <translation type="unfinished">總持續時間:</translation>
- </message>
- <message>
- <location line="-121"/>
- <source>Aspect Ratio:</source>
- <translation type="unfinished">外觀比例:</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Image Size:</source>
- <translation type="unfinished">圖像大小:</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Codec 4CC:</source>
- <translation type="unfinished">編解碼器 4CC:</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Extra Video Properties</source>
- <translation type="unfinished">額外的視訊屬性</translation>
- </message>
- <message>
- <source>Global Motion Compensation:</source>
- <translation type="obsolete">整體動作補償:</translation>
- </message>
- <message>
- <source>Packed Bitstream:</source>
- <translation type="obsolete">打包好的位元流:</translation>
- </message>
- <message>
- <source>Quarter Pixel:</source>
- <translation type="obsolete">1/4 像素:</translation>
- </message>
- <message>
- <location line="+52"/>
- <source>Audio</source>
- <translation type="unfinished">音訊</translation>
- </message>
- <message>
- <source>File Size:</source>
- <translation type="obsolete">檔案大小:</translation>
- </message>
- <message>
- <location line="+38"/>
- <source>Frequency:</source>
- <translation type="unfinished">頻率:</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Variable Bitrate:</source>
- <translation type="unfinished">變動位元率:</translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Bitrate:</source>
- <translation type="unfinished">位元率:</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Channels:</source>
- <translation type="unfinished">聲道:</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Codec:</source>
- <translation type="unfinished">編解碼器:</translation>
- </message>
- <message>
- <location line="-125"/>
- <source>ExtraDataSize:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Extra data :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+123"/>
- <source>Copy to Clipboard</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+29"/>
- <source>OK</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>psdemuxer</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
- <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>
- </message>
- <message>
- <location line="+41"/>
- <source>There are several files with sequential file names. Should they be all loaded ?</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>qaudiotracks</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
- <source>Select audio file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
- <location line="+140"/>
- <source>Error</source>
- <translation type="unfinished">錯誤</translation>
- </message>
- <message>
- <location line="-140"/>
- <source>Cannot use that file as audio track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+140"/>
- <source>Some tracks are used multiple times</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+126"/>
- <source>Track </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source> from video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>File </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+34"/>
- <source>.... Add audio track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+33"/>
- <source>copy</source>
- <translation type="unfinished"></translation>
+ <source>Sharpen convolution.</source>
+ <translation>5.3-銳化卷積(Sharpen convolution)</translation>
 </message>
 </context>
 <context>
- <name>qencoding</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+65"/>
- <location line="+20"/>
- <source>Privileges Required</source>
- <translation type="unfinished">需要特殊權限</translation>
- </message>
- <message>
- <location line="-20"/>
- <location line="+20"/>
- <source>Root privileges are required to perform this operation.</source>
- <translation type="unfinished">需要 Root 權限來實行這項操作。</translation>
- </message>
- <message>
- <location line="+101"/>
- <source>First Pass</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Pass 1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Encoding...</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>stackfield</name>
 <message>
- <location line="+188"/>
- <source>The encoding is paused. Do you want to resume or abort?</source>
- <translation type="unfinished">編碼已經暫停。您要繼續或中止?</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
+ <source>Stack Fields</source>
+ <translation>2.8-非堆疊掃描場(底上頂下交換)</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Resume</source>
- <translation type="unfinished">繼續</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Abort</source>
- <translation type="unfinished">中止</translation>
+ <source>Put even lines on top, odd lines at bottom.</source>
+ <translation>將偶數行放在上面，奇數行放下面，，是用來看看一些堆疊情況，如需改進。</translation>
 </message>
 </context>
 <context>
- <name>qfile</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
- <location line="+139"/>
- <source>All files (*.*)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-54"/>
- <location line="+96"/>
- <source> files (*.</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>stillimage</name>
 <message>
- <location line="-68"/>
- <source>Overwrite file </source>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
+ <location line="+186"/>
+ <source>Still Image</source>
 <translation type="unfinished"></translation>
 </message>
-</context>
-<context>
- <name>qgui2</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
- <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>
+ <location line="-185"/>
+ <source>Duplicate frames for a given duration.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+230"/>
- <source>Recent Files</source>
+ <location line="+181"/>
+ <source>_Start time:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Recent Projects</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+627"/>
- <source>Play/Stop</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Go to previous frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Go to next frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Go to previous keyframe</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Go to next keyframe</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Set start marker</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Set end marker</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Go to first frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Go to last frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Go to marker A</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Go to marker B</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Backward one minute</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Forward one minute</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+605"/>
- <source>The application has encountered a fatal problem
-The current editing has been saved and will be reloaded at next start</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+262"/>
- <source>%c-%s (%02d)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+315"/>
- <source> (%d track(s))</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>qgui2menu</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+51"/>
- <source>Project Script</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source> Project</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>&amp;Run Project...</source>
+ <source>_Duration:</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+5"/>
- <source>&amp;Debug Project...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Save &amp;As Project...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Scripting Shell</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source> Shell</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Scripting Reference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source> Reference</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>qjobs</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
- <source>Ready</source>
- <translation type="unfinished">準備</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Succeeded</source>
- <translation type="unfinished">已成功</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Failed</source>
- <translation type="unfinished">已失敗</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Deleted</source>
- <translation type="unfinished">已刪除</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Running</source>
- <translation type="unfinished">正在執行</translation>
- </message>
- <message>
- <location line="+24"/>
- <source>Job Name</source>
- <translation type="unfinished">工作名稱</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Status</source>
- <translation type="unfinished">狀態</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Start Time</source>
- <translation type="unfinished">起始時間</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>End Time</source>
- <translation type="unfinished">終了時間</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+14"/>
- <source>Sure!</source>
- <translation type="unfinished">確定!</translation>
- </message>
- <message>
- <location line="-14"/>
- <source>Delete job</source>
- <translation type="unfinished">刪除工作</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Are you sure you want to delete %s job?</source>
- <translation type="unfinished">確定要刪除 %s 工作?</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Delete *all* job</source>
- <translation type="unfinished">刪除*所有*工作</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Are you sure you want to delete ALL jobs?</source>
- <translation type="unfinished">確定要刪除所有工作?</translation>
- </message>
- <message>
- <location line="+24"/>
- <source>Already done</source>
- <translation type="unfinished">已經完成</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>This script has already been successfully executed.</source>
- <translation type="unfinished">這個腳本已經成功執行。</translation>
- </message>
-</context>
-<context>
- <name>qlicense</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="+25"/>
- <source>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished">&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt; &lt;title&gt;Avidemux 是自由軟體；您可以遵照自由軟體基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式。&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1 {size:612.0pt 792.0pt; margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1 {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt; &lt;div class=&quot;Section1&quot;&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June 1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991 Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite 330, Boston, MA 02111-1307 USA&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation&apos;s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone&apos;s free use or not licensed at all.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and conditions for copying, distribution and modification follow.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and distribute verbatim copies of the Program&apos;s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style= &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style= &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style= &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt; &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt; &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt; &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
 </context>
 <context>
- <name>qmainfilter</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
- <source>Partial</source>
- <translation type="unfinished">區段</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>This filter cannot be made partial</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+244"/>
- <source>Add</source>
- <translation type="unfinished">加入</translation>
- </message>
+ <name>swapuv</name>
 <message>
- <location line="-96"/>
- <source>Remove</source>
- <translation type="unfinished">移除</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+42"/>
+ <source>Swap the U and V planes.</source>
+ <translation>U和V交換色彩</translation>
 </message>
 <message>
 <location line="-1"/>
- <source>Configure</source>
- <translation type="unfinished">設定</translation>
- </message>
- <message>
- <location line="-2"/>
- <source>Move up</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Move down</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Make partial</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+224"/>
- <source>Load video filters..</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+15"/>
- <source>Save video filters..</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>qprocessing</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+66"/>
- <source>Unknown</source>
- <translation type="unfinished">未知</translation>
- </message>
- <message>
- <location line="+94"/>
- <source>_Resume</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>The processing is paused.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Cancel it ?</source>
- <translation type="unfinished"></translation>
+ <source>Swap UV</source>
+ <translation>3.3-交換 UV色彩</translation>
 </message>
 </context>
 <context>
- <name>qprops</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
- <source>No</source>
- <translation type="unfinished">否</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Yes</source>
- <translation type="unfinished">是</translation>
- </message>
- <message>
- <location line="+75"/>
- <source>Mono</source>
- <translation type="unfinished">單音</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Stereo</source>
- <translation type="unfinished">立體聲</translation>
- </message>
- <message>
- <location line="+46"/>
- <source>Video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Codec 4CC:	</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>telecide</name>
 <message>
- <location line="+2"/>
- <source>Image Size:	</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+193"/>
+ <source>Top</source>
+ <translation>頂部</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Aspect Ratio:	</source>
- <translation type="unfinished"></translation>
+ <location line="+11"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Frame Rate:	</source>
- <translation type="unfinished"></translation>
+ <location line="-6"/>
+ <source>Never</source>
+ <translation>從不</translation>
 </message>
 <message>
- <location line="+2"/>
- <location line="+27"/>
- <source>Total Duration:	</source>
- <translation type="unfinished"></translation>
+ <location line="+20"/>
+ <source>_Direct threshold:</source>
+ <translation>_正向界限值:</translation>
 </message>
 <message>
- <location line="-25"/>
- <source>Extra Video Properties</source>
- <translation type="unfinished"></translation>
+ <location line="-19"/>
+ <source>If still combed</source>
+ <translation>如果仍然有梳形雜訊</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>ExtraDataSize:	</source>
- <translation type="unfinished"></translation>
+ <location line="+9"/>
+ <source>Process image (not fields)</source>
+ <translation>處理圖像 (非幀掃描場)</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Extra data:	</source>
- <translation type="unfinished"></translation>
+ <location line="+26"/>
+ <source>Decomb Telecide</source>
+ <translation>2.4-迪刊謀.貼立賽德(Decomb Telecide)-除梳下拉反向混合色度資訊</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Audio</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
+ <source>Decomb telecide</source>
+ <translation>2.4-迪刊謀.貼立賽德(Decomb Telecide)-除梳下拉反向混合色度資訊</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Codec:		</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="-18"/>
+ <source>_Try backward:</source>
+ <translation>_嘗試反向:</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Channels:	</source>
- <translation type="unfinished"></translation>
+ <location line="-16"/>
+ <source>Always</source>
+ <translation>總是</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Bitrate:	</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+1"/>
+ <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
+ <translation>唐納德(Donald Graft)抽取，用漸進式幀替換 ivtc 模式，影片停留在 30 fps。</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Frequency:	</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+26"/>
+ <source>Bl_end</source>
+ <translation>混_合</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>No Audio</source>
- <translation type="unfinished"></translation>
+ <location line="-32"/>
+ <source>Bottom</source>
+ <translation>底部</translation>
 </message>
 <message>
- <location line="-132"/>
- <source>%2.3f fps</source>
- <translation type="unfinished"></translation>
+ <location line="+31"/>
+ <source>Debu_g</source>
+ <translation>除_錯</translation>
 </message>
 <message>
- <location line="+4"/>
- <location line="+59"/>
- <source>%02d:%02d:%02d.%03d</source>
- <translation type="unfinished"></translation>
+ <location line="-5"/>
+ <source>_Noise threshold:</source>
+ <translation>_雜訊界限值:</translation>
 </message>
 <message>
- <location line="-65"/>
- <source>%s (%u:%u)</source>
- <translation type="unfinished"></translation>
+ <location line="-5"/>
+ <source>_Postprocessing:</source>
+ <translation>_後置處理:</translation>
 </message>
-</context>
-<context>
- <name>qshell</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
- <source>Enter your commands then press the evaluate button or CTRL+ENTER.
-</source>
- <translation type="unfinished"></translation>
+ <location line="+9"/>
+ <source>Sho_w info</source>
+ <translation>顯示_資訊</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
-Ready.
-</source>
- <translation type="unfinished"></translation>
+ <location line="-10"/>
+ <source>_Field order:</source>
+ <translation>_掃描場優先順序:</translation>
 </message>
-</context>
-<context>
- <name>qtalert</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
- <source>Alert</source>
- <translation type="unfinished">警告</translation>
+ <location line="-5"/>
+ <source>Process image (not fields), debug</source>
+ <translation>處理圖像 (非幀掃描場)，除錯</translation>
 </message>
 <message>
- <location line="+6"/>
- <location line="+25"/>
- <location line="+25"/>
- <source>Info</source>
- <translation type="unfinished">資訊</translation>
+ <location line="-20"/>
+ <source>NTSC converted from PAL</source>
+ <translation>從 PAL 轉成 NTSC</translation>
 </message>
 <message>
 <location line="+24"/>
- <location line="+30"/>
- <source>Confirmation</source>
- <translation type="unfinished">答覆</translation>
- </message>
- <message>
- <location line="+19"/>
- <location line="+30"/>
- <source>Question</source>
- <translation type="unfinished">問題</translation>
+ <source>_Strategy:</source>
+ <translation>_策略:</translation>
 </message>
 <message>
 <location line="-7"/>
- <source>Question?</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>qtray</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
- <source>Open Avidemux</source>
- <translation type="unfinished">開啟 Avidemux</translation>
- </message>
-</context>
-<context>
- <name>qvobsub</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
- <source>Select Idx File</source>
- <translation type="unfinished">選擇 Idx 檔案</translation>
- </message>
-</context>
-<context>
- <name>removePlaneFilter</name>
- <message>
- <source>Process luma plane</source>
- <translation type="obsolete">處理明度平面</translation>
- </message>
-</context>
-<context>
- <name>removeplane</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+151"/>
- <source>Process luma plane</source>
- <translation type="unfinished">處理明度平面</translation>
- </message>
- <message>
- <location line="-106"/>
- <source>Remove Plane</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+105"/>
- <source>Keep Y Plane</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Keep U Plane</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Process chromaU plane</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Keep V Plane</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Process chromaV plane</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Remove plane</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>resampleFps</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+358"/>
- <source>_Mode:</source>
- <translation type="unfinished">模式(_M):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_New frame rate:</source>
- <translation type="unfinished">新畫格率(_N):</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Resample fps</source>
- <translation type="unfinished">重複取樣 fps</translation>
- </message>
- <message>
- <location line="-322"/>
- <source>Custom</source>
- <translation type="unfinished">自訂</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>25 (PAL)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>23.976 (Film)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>29.97 (NTSC)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>50 (Pal)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>59.93 (NTSC)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source>Resample FPS</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Change and enforce FPS. Keep duration and sync.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>resize</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
- <source>Width and height cannot be odd</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
- <source>swsResize</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>swScale Resizer.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>resizeDialog</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+13"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+13"/>
- <source>Resize</source>
- <translation type="unfinished">調整大小</translation>
- </message>
- <message>
- <location line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
- <source>Aspect Ratio</source>
- <translation type="unfinished">外觀比例</translation>
- </message>
- <message>
- <location line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
- <source>Lock Aspect Ratio</source>
- <translation type="unfinished">鎖定外觀比例</translation>
- </message>
- <message>
- <location line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
- <source>Source:</source>
- <translation type="unfinished">來源:</translation>
- </message>
- <message>
- <location line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
- <location line="+42"/>
- <source>1:1</source>
- <translation type="unfinished">1:1</translation>
- </message>
- <message>
- <location line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <source>4:3</source>
- <translation type="unfinished">4:3</translation>
- </message>
- <message>
- <location line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
- <location line="+42"/>
- <source>16:9</source>
- <translation type="unfinished">16:9</translation>
- </message>
- <message>
- <location line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-18"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-18"/>
- <source>Destination:</source>
- <translation type="unfinished">目的檔:</translation>
- </message>
- <message>
- <location line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
- <source>Resize Dimensions</source>
- <translation type="unfinished">調整大小尺寸</translation>
- </message>
- <message>
- <location line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
- <source>Width:</source>
- <translation type="unfinished">寬度:</translation>
- </message>
- <message>
- <location line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+36"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+36"/>
- <source>Height:</source>
- <translation type="unfinished">高度:</translation>
- </message>
- <message>
- <location line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
- <source>Round to the Nearest Multiple of 16</source>
- <translation type="unfinished">進展為最接近 16 的倍數</translation>
- </message>
- <message>
- <location line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+55"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+55"/>
- <source>1%</source>
- <translation type="unfinished">1%</translation>
+ <source>Postproc on best match</source>
+ <translation>在最佳比對上執行後置處理</translation>
 </message>
 <message>
- <location line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
- <source>Percent</source>
- <translation type="unfinished">百分比</translation>
+ <location line="-19"/>
+ <source>3:2 pulldown</source>
+ <translation>往下拉3:2</translation>
 </message>
 <message>
 <location line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
- <source>200%</source>
- <translation type="unfinished">200%</translation>
- </message>
- <message>
- <location line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+50"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+50"/>
- <source>Error X / Y:</source>
- <translation type="unfinished">錯誤 X / Y:</translation>
- </message>
- <message>
- <location line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+7"/>
- <source>0.00 / 0.00</source>
- <translation type="unfinished">0.00 / 0.00</translation>
- </message>
- <message>
- <location line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+51"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+51"/>
- <source>Resize Method:</source>
- <translation type="unfinished">調整大小方式:</translation>
- </message>
- <message>
- <location line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
- <source>Bilinear</source>
- <translation type="unfinished">雙線性</translation>
- </message>
- <message>
- <location line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
- <source>Bicubic</source>
- <translation type="unfinished">雙立方</translation>
- </message>
- <message>
- <location line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
- <source>Lanzcos3</source>
- <translation type="unfinished">Lanzcos3</translation>
- </message>
-</context>
-<context>
- <name>resizeWindow</name>
- <message>
- <source>Width and height cannot be odd</source>
- <translation type="obsolete">寬度與高度不可為奇數</translation>
- </message>
-</context>
-<context>
- <name>rotate</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
- <location line="+163"/>
- <source>Rotate</source>
- <translation type="unfinished">旋轉</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>90 degrees</source>
- <translation type="unfinished">90 度</translation>
- </message>
- <message>
- <source>90Â°</source>
- <translation type="obsolete">90Â°</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>180 degrees</source>
- <translation type="unfinished">180 度</translation>
- </message>
- <message>
- <source>180Â°</source>
- <translation type="obsolete">180Â°</translation>
+ <source>Postproc and show zones (debug)</source>
+ <translation>後置處理和顯示區域 (除錯)</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>270 degrees</source>
- <translation type="unfinished">270 度</translation>
+ <location line="+14"/>
+ <source>Postp_rocessing threshold:</source>
+ <translation>後置_處理界限值:</translation>
 </message>
 <message>
- <source>270Â°</source>
- <translation type="obsolete">270Â°</translation>
+ <location line="-35"/>
+ <source>No strategy</source>
+ <translation>無策略</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>_Angle:</source>
- <translation type="unfinished">角度(_A):</translation>
+ <location line="+37"/>
+ <source>_Use chroma to decide</source>
+ <translation>_使用色度來判定</translation>
 </message>
 <message>
 <location line="-4"/>
- <source>90°</source>
- <translation type="unfinished">90°</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>180°</source>
- <translation type="unfinished">180°</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>270°</source>
- <translation type="unfinished">270°</translation>
- </message>
- <message>
- <location line="-158"/>
- <source>Rotate the image by 90/180/270 degrees.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>rotateFilter</name>
- <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
- </message>
- <message>
- <source>90 degrees</source>
- <translation type="obsolete">90 度</translation>
- </message>
- <message>
- <source>90Â°</source>
- <translation type="obsolete">90Â°</translation>
- </message>
- <message>
- <source>180 degrees</source>
- <translation type="obsolete">180 度</translation>
- </message>
- <message>
- <source>180Â°</source>
- <translation type="obsolete">180Â°</translation>
- </message>
- <message>
- <source>270 degrees</source>
- <translation type="obsolete">270 度</translation>
- </message>
- <message>
- <source>270Â°</source>
- <translation type="obsolete">270Â°</translation>
- </message>
- <message>
- <source>_Angle:</source>
- <translation type="obsolete">角度(_A):</translation>
- </message>
- <message>
- <source>Rotate</source>
- <translation type="obsolete">旋轉</translation>
- </message>
-</context>
-<context>
- <name>seekablePreviewDialog</name>
- <message>
- <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
- <source>Preview</source>
- <translation type="unfinished">預覽</translation>
- </message>
- <message>
- <source>00:00:00.000</source>
- <translation type="obsolete">00:00:00.000</translation>
- </message>
- <message>
- <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
- <source>Back one minute</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>&lt;&lt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Play</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Next image</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>&gt;&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Forward one minute</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>separateFields</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
- <source>Separate Fields</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Split each image into 2 fields.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>shaderLoader</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-3"/>
- <source>Reload shader</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>sharpen</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+27"/>
- <source>Sharpen convolution.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>3x3 convolution filter :sharpen.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>srtDialog</name>
- <message>
- <source>Subtitle Font Size and Position</source>
- <translation type="obsolete">字幕字型大小和位置</translation>
- </message>
- <message>
- <source>Font Size :</source>
- <translation type="obsolete">字型大小 :</translation>
- </message>
-</context>
-<context>
- <name>stackfield</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
- <source>Stack Fields</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Put even lines on top, odd lines at bottom.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>subAss</name>
- <message>
- <source>_Subtitle file (ASS/SSA):</source>
- <translation type="obsolete">字幕檔(A_SS/SSA):</translation>
- </message>
- <message>
- <source>Select Subtitle file</source>
- <translation type="obsolete">選擇字幕檔</translation>
- </message>
- <message>
- <source>_Line spacing:</source>
- <translation type="obsolete">行距(_L):</translation>
- </message>
- <message>
- <source>_Font scale:</source>
- <translation type="obsolete">字體縮放(_F):</translation>
- </message>
- <message>
- <source>_Top margin:</source>
- <translation type="obsolete">頂部邊界(_T):</translation>
- </message>
- <message>
- <source>Botto_m margin</source>
- <translation type="obsolete">底部邊界(_M)</translation>
- </message>
- <message>
- <source>ASS</source>
- <translation type="obsolete">ASS</translation>
+ <source>_Backward threshold:</source>
+ <translation>_反向界限值:</translation>
 </message>
-</context>
-<context>
- <name>swapuv</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
- <source>Swap UV</source>
- <translation type="unfinished"></translation>
+ <location line="-31"/>
+ <source>PAL/SECAM</source>
+ <translation>PAL/SECAM</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Swap the U and V planes.</source>
- <translation type="unfinished"></translation>
+ <location line="+17"/>
+ <source>None but compute</source>
+ <translation>無但計算</translation>
 </message>
 </context>
 <context>
- <name>telecide</name>
+ <name>timestamp</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
- <source>Decomb telecide</source>
+ <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+ <source> h</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
+ <source> m</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+186"/>
- <source>No strategy</source>
- <translation type="unfinished">無策略</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>3:2 pulldown</source>
- <translation type="unfinished">3:2 pulldown</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>PAL/SECAM</source>
- <translation type="unfinished">PAL/SECAM</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>NTSC converted from PAL</source>
- <translation type="unfinished">從 PAL 轉成 NTSC</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Top</source>
- <translation type="unfinished">頂部</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bottom</source>
- <translation type="unfinished">底部</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Never</source>
- <translation type="unfinished">絕不</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>If still combed</source>
- <translation type="unfinished">如果仍然有梳形雜訊</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Always</source>
- <translation type="unfinished">總是</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>None but compute</source>
- <translation type="unfinished">無但計算</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Postproc on best match</source>
- <translation type="unfinished">在最佳比對上執行後置處理</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Postproc and show zones (debug)</source>
- <translation type="unfinished">後置處理和顯示區域 (除錯)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Process image (not fields)</source>
- <translation type="unfinished">處理圖像 (非圖場)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Process image (not fields), debug</source>
- <translation type="unfinished">處理圖像 (非圖場)，除錯</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>_Strategy:</source>
- <translation type="unfinished">策略(_S):</translation>
- </message>
- <message>
 <location line="+1"/>
- <source>_Field order:</source>
+ <source> s</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location line="+1"/>
- <source>_Postprocessing:</source>
- <translation type="unfinished">後置處理(_P):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Try backward:</source>
- <translation type="unfinished">嘗試反向(_T):</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Direct threshold:</source>
- <translation type="unfinished">正向臨界值(_D):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Backward threshold:</source>
- <translation type="unfinished">反向臨界值(_B):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>_Noise threshold:</source>
- <translation type="unfinished">雜訊臨界值(_N):</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Postp_rocessing threshold:</source>
- <translation type="unfinished">後置處理臨界值(_R):</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>_Use chroma to decide</source>
- <translation type="unfinished">使用色度來判定(_U)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Sho_w info</source>
- <translation type="unfinished">顯示資訊(_W)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Debu_g</source>
- <translation type="unfinished">除錯(_G)</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Bl_end</source>
- <translation type="unfinished">混合(_E)</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Decomb Telecide</source>
- <translation type="unfinished">去除梳形雜訊電視電影</translation>
- </message>
 </context>
 <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>錯誤</translation>
 </message>
 <message>
- <location line="+0"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+196"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+333"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+91"/>
+ <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 type="unfinished"></translation>
+ <translation>這是用舊版本Avidemux建立的索引檔 &apos;案，請刪除 idx2 檔，然後重新打開。</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+ <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" 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 type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
- <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
- <source>Indexing</source>
- <translation type="unfinished">正在索引</translation>
+ <translation>有幾個檔使用順序檔案名稱，將所有載入他們嗎？</translation>
 </message>
 </context>
 <context>
@@ -15150,50 +8902,50 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
 <source>_Bitrate:</source>
- <translation type="unfinished">位元率(_B):</translation>
+ <translation>_位元率:</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>TwoLame Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>兩個Lame的配置</translation>
 </message>
 </context>
 <context>
 <name>uisupport</name>
 <message>
- <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+ <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
 <source>X11</source>
- <translation type="unfinished"></translation>
+ <translation>X11</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>MS Windows GDI</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Mac OS X Quartz 2D</source>
- <translation type="unfinished"></translation>
+ <translation>MS Windows GDI</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Mac OS X QuickDraw</source>
- <translation type="unfinished"></translation>
+ <location line="+6"/>
+ <source>OpenGL</source>
+ <translation>OpenGL</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>OpenGL</source>
- <translation type="unfinished"></translation>
+ <location line="-4"/>
+ <source>Mac OS X Quartz 2D</source>
+ <translation>Mac OS X Quartz 2D</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location line="+7"/>
 <source>MS Windows Direct3D</source>
- <translation type="unfinished"></translation>
+ <translation>MS Windows Direct3D</translation>
 </message>
 <message>
 <location line="+3"/>
 <source>Default Raster</source>
- <translation type="unfinished"></translation>
+ <translation>預設柵格</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Mac OS X QuickDraw</source>
+ <translation>Mac OS X QuickDraw</translation>
 </message>
 </context>
 <context>
@@ -15201,299 +8953,208 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp" line="+47"/>
 <source>Unstack Fields</source>
- <translation type="unfinished"></translation>
+ <translation>2.8-非堆疊掃描場(底上頂下交換)</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Weave top and bottom halves.</source>
+ <translation>上半部和下半部交換，是用來看看一些交換情況，如需改進。</translation>
+ </message>
+</context>
+<context>
+ <name>vaEncH264</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
+ <source>vaH264 Configuration</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
- <name>vaapiResize</name>
+ <name>vaH264</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
- <source>vaapi: Resize</source>
+ <location line="-4"/>
+ <source>_IDR Period:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
- <source>vaapi: Resize image using vaapi.</source>
+ <source>_Bitrate(kbps)</source>
 <translation type="unfinished"></translation>
 </message>
+</context>
+<context>
+ <name>vaapiResize</name>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+208"/>
+ <source>vaapi</source>
+ <translation>vaapi</translation>
+ </message>
 <message>
- <location line="+134"/>
- <source>Width :</source>
- <translation type="unfinished"></translation>
+ <location line="-140"/>
+ <source>vaapi: Resize image using vaapi.</source>
+ <translation>vaapi： 使用 vaapi 的大小調整圖像。</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Height :</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>vaapi: Resize</source>
+ <translation>vaapi: 調整大小</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+137"/>
 <source>mpeg-&gt;PC:</source>
- <translation type="unfinished"></translation>
+ <translation>mpeg-&gt;PC:</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>vaapi</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>Height :</source>
+ <translation>高 :</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Width :</source>
+ <translation>寬 :</translation>
 </message>
 </context>
 <context>
 <name>vaenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
 <source>Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">位元速率 (kbps):</translation>
 </message>
 <message>
- <location line="+1"/>
 <source>Max Bitrate (kbps):</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">最大位元速率 (kbps):</translation>
 </message>
 <message>
- <location line="+4"/>
 <source>VAAPI H264 Encoder</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">VAAPI H264 編碼器</translation>
 </message>
 </context>
 <context>
 <name>vdpaudeint</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
- <source>vdpauDeint</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+332"/>
+ <source>vdpau</source>
+ <translation>vdpau</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>VDPAU deinterlacer (+resize).</source>
- <translation type="unfinished"></translation>
+ <location line="-6"/>
+ <source>_Deint Mode:</source>
+ <translation>_Deint 模式:</translation>
 </message>
 <message>
- <location line="+185"/>
- <source>Keep Top Field</source>
- <translation type="unfinished"></translation>
+ <location line="-2"/>
+ <source>_Ivtc:</source>
+ <translation>_Ivtc:</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Keep Bottom Field</source>
- <translation type="unfinished"></translation>
+ <location line="-193"/>
+ <source>vdpauDeint</source>
+ <translation>vdpau去交錯</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Double framerate</source>
- <translation type="unfinished"></translation>
+ <location line="+194"/>
+ <source>_Resize:</source>
+ <translation>_調整大小</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>_Ivtc:</source>
- <translation type="unfinished"></translation>
+ <location line="-8"/>
+ <source>Keep Top Field</source>
+ <translation>維持頂部</translation>
 </message>
 <message>
 <location line="+1"/>
- <source>_Resize:</source>
- <translation type="unfinished"></translation>
+ <source>Keep Bottom Field</source>
+ <translation>維持底部</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>_Deint Mode:</source>
- <translation type="unfinished"></translation>
+ <location line="+10"/>
+ <source>Height :</source>
+ <translation>高 :</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Width :</source>
- <translation type="unfinished"></translation>
+ <location line="-196"/>
+ <source>VDPAU deinterlacer (+resize).</source>
+ <translation>VDPAU 去交錯化 （+ 調整大小）</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Height :</source>
- <translation type="unfinished"></translation>
+ <location line="+195"/>
+ <source>Width :</source>
+ <translation>寬 :</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>vdpau</source>
- <translation type="unfinished"></translation>
+ <location line="-8"/>
+ <source>Double framerate</source>
+ <translation>雙倍幀率</translation>
 </message>
 </context>
 <context>
 <name>vdpresize</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+69"/>
- <source>vdpau: Resize</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+208"/>
+ <source>vdpau</source>
+ <translation>vdpau</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-138"/>
 <source>vdpau: Resize image using vdpau.</source>
- <translation type="unfinished"></translation>
+ <translation>vdpau: 使用vdpau調整圖像大小。</translation>
 </message>
 <message>
- <location line="+133"/>
- <source>Width :</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>vdpau: Resize</source>
+ <translation>vdpau: 調整大小</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+135"/>
 <source>Height :</source>
- <translation type="unfinished"></translation>
+ <translation>高 :</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>vdpau</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>Width :</source>
+ <translation>寬 :</translation>
 </message>
 </context>
 <context>
 <name>vflip</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
- <source>Vertical Flip</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+48"/>
 <source>Vertically flip the image.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>vidBlendRemoval</name>
- <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
- </message>
- <message>
- <source>If value is smaller than threshold it is considered valid.Smaller value might mean more false positive.</source>
- <translation type="obsolete">如果數值小於臨界值，它被視為有效的。較小的值可能意味著更多的誤判。</translation>
- </message>
- <message>
- <source>_Noise:</source>
- <translation type="obsolete">雜訊(_N):</translation>
- </message>
- <message>
- <source>If pixels are closer than noise, they are considered to be the same</source>
- <translation type="obsolete">如果像素太接近雜訊，它們被視為一樣</translation>
- </message>
- <message>
- <source>I_dentical:</source>
- <translation type="obsolete">相同(_D):</translation>
- </message>
- <message>
- <source>If metric is less than identical, images are considered identical</source>
- <translation type="obsolete">如果量度少於等同的，圖像被視為完全相同</translation>
- </message>
- <message>
- <source>_Show metrics</source>
- <translation type="obsolete">顯示量度(_S)</translation>
- </message>
- <message>
- <source>Show metric in image (debug)</source>
- <translation type="obsolete">圖像顯示量度 (除錯)</translation>
- </message>
- <message>
- <source>Blend Removal</source>
- <translation type="obsolete">去除混合</translation>
- </message>
-</context>
-<context>
- <name>vidColorYuv</name>
- <message>
- <source>None</source>
- <translation type="obsolete">無</translation>
- </message>
-</context>
-<context>
- <name>vidHardPDRemoval</name>
- <message>
- <source>Metrics</source>
- <translation type="obsolete">量度</translation>
- </message>
- <message>
- <source>Do you want to print metrics on screen ?</source>
- <translation type="obsolete">確定要將矩陣顯示在螢幕上?</translation>
- </message>
- <message>
- <source>_Threshold:</source>
- <translation type="obsolete">臨界值(_T):</translation>
- </message>
- <message>
- <source>If value is smaller than threshold it is considered valid. Smaller value might mean more false positive</source>
- <translation type="obsolete">如果數值小於臨界值，它被視為有效的。較小的值可能意味著更多的誤判</translation>
- </message>
- <message>
- <source>_Noise:</source>
- <translation type="obsolete">雜訊(_N):</translation>
- </message>
- <message>
- <source>If pixels are closer than noise, they are considered to be the same</source>
- <translation type="obsolete">如果像素太接近雜訊，它們被視為一樣</translation>
- </message>
- <message>
- <source>_Identical:</source>
- <translation type="obsolete">相同(_I):</translation>
- </message>
- <message>
- <source>If metric is less than identical, images are considered identical</source>
- <translation type="obsolete">如果量度少於等同的，圖像被視為完全相同</translation>
+ <translation>垂直翻轉圖像-對X軸翻轉</translation>
 </message>
 <message>
- <source>_Show metrics</source>
- <translation type="obsolete">顯示量度(_S)</translation>
- </message>
- <message>
- <source>Show metric in image (debug)</source>
- <translation type="obsolete">圖像顯示量度 (除錯)</translation>
- </message>
- <message>
- <source>Hard IVTC Removal</source>
- <translation type="obsolete">硬去除 IVTC</translation>
+ <location line="-1"/>
+ <source>Vertical Flip</source>
+ <translation>1.1-上下顛倒</translation>
 </message>
 </context>
 <context>
 <name>vobSubDialog</name>
 <message>
- <source>VobSub Settings</source>
- <translation type="obsolete">VobSub 設定</translation>
- </message>
- <message>
- <source>Language:</source>
- <translation type="obsolete">語言:</translation>
- </message>
- <message>
- <source>Idx File:</source>
- <translation type="obsolete">Idx 檔案:</translation>
- </message>
- <message>
- <source>Delay:</source>
- <translation type="obsolete">延遲:</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+74"/>
+ <source>Idx File :</source>
+ <translation>Idx 檔案 :</translation>
 </message>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+13"/>
- <source>Subtitle Font Size and Position</source>
- <translation type="unfinished">字幕字型大小和位置</translation>
+ <location line="-14"/>
+ <source>Select File</source>
+ <translation>選擇檔案</translation>
 </message>
 <message>
- <location line="+37"/>
+ <location line="-10"/>
 <source>Delay :</source>
- <translation type="unfinished"></translation>
+ <translation>延遲</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Select File</source>
- <translation type="unfinished"></translation>
+ <location line="-37"/>
+ <source>Subtitle Font Size and Position</source>
+ <translation>字幕字型大小和位置</translation>
 </message>
 <message>
- <location line="+7"/>
+ <location line="+54"/>
 <source>Language :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Idx File :</source>
- <translation type="unfinished"></translation>
+ <translation>語言:</translation>
 </message>
 </context>
 <context>
@@ -15501,3010 +9162,2935 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+331"/>
 <source>VBR</source>
- <translation type="unfinished">VBR</translation>
+ <translation>可變位元率(VBR)</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+17"/>
+ <source>_Bitrate:</source>
+ <translation>_位元率:</translation>
+ </message>
+ <message>
+ <location line="-16"/>
 <source>Quality based</source>
- <translation type="unfinished">基本品質</translation>
+ <translation>基本品質</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Mode:</source>
- <translation type="unfinished">模式(_M):</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>_Bitrate:</source>
- <translation type="unfinished">位元率(_B):</translation>
+ <translation>_模式:</translation>
 </message>
 <message>
- <location line="+2"/>
+ <location line="+16"/>
 <source>_Quality:</source>
- <translation type="unfinished">品質(_Q):</translation>
+ <translation>_品質:</translation>
 </message>
 <message>
 <location line="+7"/>
 <source>Vorbis Configuration</source>
- <translation type="unfinished">Vorbis 設定</translation>
+ <translation>Vorbis 配置</translation>
 </message>
 </context>
 <context>
 <name>vsWindow</name>
 <message>
 <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+68"/>
- <source>Open VapourSynth File 1</source>
- <translation type="unfinished"></translation>
+ <source>VS File Files (*.vpy)</source>
+ <translation>VS 的檔 (*.vpy)</translation>
 </message>
 <message>
 <location line="+0"/>
- <source>VS File Files (*.vpy)</source>
- <translation type="unfinished"></translation>
+ <source>Open VapourSynth File 1</source>
+ <translation>打開 VapourSynth 檔 1</translation>
 </message>
 </context>
 <context>
 <name>webmmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
- <source>Unsupported Video.
-Only VP8/VP9 video and Vorbis/Opus audio supported</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+28"/>
+ <source>Display width</source>
+ <translation>顯示寬度</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Unsupported Audio.
-Only VP8/VP9 video and Vorbis/Opus audio supported</source>
- <translation type="unfinished"></translation>
+ <location line="-1"/>
+ <source>Force display width</source>
+ <translation>強制顯示寬度</translation>
 </message>
 <message>
- <location line="+78"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+156"/>
 <source>Saving Webm</source>
- <translation type="unfinished"></translation>
+ <translation>儲存 Webm</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+27"/>
- <source>Force display width</source>
- <translation type="unfinished"></translation>
+ <location line="-78"/>
+ <source>Unsupported Audio.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+ <translation>只有 VP8/VP9 影片和 Vorbis/s/Opus音訊支援</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Display width</source>
- <translation type="unfinished"></translation>
+ <location line="-12"/>
+ <source>Unsupported Video.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+ <translation>只有 VP8/VP9 影片和 Vorbis/Opus音訊支援</translation>
 </message>
 <message>
- <location line="+3"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+4"/>
 <source>Webm Muxer</source>
- <translation type="unfinished"></translation>
+ <translation>Webm複合器</translation>
 </message>
 </context>
 <context>
 <name>workingDialog</name>
 <message>
- <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
- <source>Processing</source>
- <translation type="unfinished">處理中</translation>
+ <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+77"/>
+ <source>Elapsed:</source>
+ <translation>已過時間:</translation>
 </message>
 <message>
- <location line="+64"/>
- <source>Elapsed:</source>
- <translation type="unfinished">已過時間:</translation>
+ <location line="+48"/>
+ <source>00:00:00</source>
+ <translation>00:00:00</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="-26"/>
 <source>Time Remaining:</source>
- <translation type="unfinished">剩餘時間:</translation>
+ <translation>剩餘時間:</translation>
 </message>
 <message>
- <location line="+26"/>
- <source>00:00:00</source>
- <translation type="unfinished">00:00:00</translation>
+ <location line="+113"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <location line="+87"/>
- <source>Cancel</source>
- <translation type="unfinished"></translation>
+ <location line="-199"/>
+ <source>Processing</source>
+ <translation>處理中</translation>
 </message>
 </context>
 <context>
 <name>x264</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
- <source>Not coded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>this mode has not been implemented
-</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+637"/>
+ <source>MB</source>
+ <translation>MB</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+ <location line="-459"/>
 <source>none</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+33"/>
- <source>Custom</source>
- <translation type="unfinished">自訂</translation>
+ <translation>無</translation>
 </message>
 <message>
- <location line="+411"/>
- <source>Target Bitrate:</source>
- <translation type="unfinished"></translation>
+ <location line="+610"/>
+ <location line="+69"/>
+ <location line="+14"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+19"/>
- <source>kbit/s</source>
- <translation type="unfinished"></translation>
+ <location line="-144"/>
+ <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+ <translation>宏塊優化需要平差自適應量化(AQ)來啟用，將自動停用宏塊優化，您要繼續嗎？</translation>
 </message>
 <message>
- <location line="-15"/>
- <source>Quantiser:</source>
- <translation type="unfinished">量化值:</translation>
+ <location line="+76"/>
+ <source>Save Profile</source>
+ <translation>儲存設定檔</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Quality:</source>
- <translation type="unfinished"></translation>
+ <location line="-167"/>
+ <source>Target Video Size:</source>
+ <translation>目標影片大小</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Target Video Size:</source>
- <translation type="unfinished"></translation>
+ <location line="+239"/>
+ <source>Do you really want to delete the </source>
+ <translation>你準備希望刪除這</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <location line="-87"/>
+ <source>Cannot load preset</source>
+ <translation>無法載入預設定</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Average Bitrate:</source>
- <translation type="unfinished">平均位元率:</translation>
+ <location line="+89"/>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <location line="+68"/>
- <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 type="unfinished"></translation>
+ <location line="-666"/>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
-
-Do you wish to continue?</source>
- <translation type="unfinished"></translation>
+ <location line="+646"/>
+ <source>Cannot save preset</source>
+ <translation>無法儲存預設定</translation>
 </message>
 <message>
- <location line="+41"/>
- <location line="+69"/>
- <location line="+14"/>
- <source>Error</source>
- <translation type="unfinished">錯誤</translation>
+ <location line="-230"/>
+ <source>Quantiser:</source>
+ <translation>量化器:</translation>
 </message>
 <message>
- <location line="-83"/>
- <source>Cannot load preset</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+ <source>Not coded</source>
+ <translation>不編碼</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>Save Profile</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="-4"/>
+ <location line="+19"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
 </message>
 <message>
- <location line="+11"/>
+ <location line="+172"/>
 <source>my profile</source>
- <translation type="unfinished"></translation>
+ <translation>我的設定檔</translation>
 </message>
 <message>
 <location line="+34"/>
- <source>Overwrite</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
 <source>Replace the following preset ?:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Cannot save preset</source>
- <translation type="unfinished"></translation>
+ <translation>替代以下的預設定嗎?</translation>
 </message>
 <message>
- <location line="+14"/>
- <source>Cannot delete custom profile</source>
- <translation type="unfinished"></translation>
+ <location line="-226"/>
+ <source>Target Bitrate:</source>
+ <translation>目標位元速率：</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Do you really want to delete the </source>
- <translation type="unfinished"></translation>
+ <location line="+19"/>
+ <source>Average Bitrate:</source>
+ <translation>平均位元率(ABR):</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+235"/>
 <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
- <translation type="unfinished"></translation>
+ <translation>設定檔 ?
+ 如果它是一個系統設定檔，它將在下一次建立。</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Delete preset</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+0"/>
+ <source>this mode has not been implemented
+</source>
+ <translation>這種模式不被執行</translation>
 </message>
 <message>
- <location line="+0"/>
- <source>Delete</source>
- <translation type="unfinished">刪除</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="-245"/>
+ <source>Quality:</source>
+ <translation>品質:</translation>
 </message>
-</context>
-<context>
- <name>x264ConfigDialog</name>
 <message>
- <source>&lt;default&gt;</source>
- <translation type="obsolete">&lt;預設&gt;</translation>
+ <location line="+240"/>
+ <source>Cannot delete custom profile</source>
+ <translation>不能刪除自訂的設定檔</translation>
 </message>
 <message>
- <source>&lt;custom&gt;</source>
- <translation type="obsolete">&lt;自訂&gt;</translation>
+ <location line="-23"/>
+ <source>Overwrite</source>
+ <translation>複寫</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+56"/>
- <source>Save As</source>
- <translation type="unfinished">另存新檔</translation>
+ <location line="-133"/>
+ <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>
- <source>Are you sure you wish to delete the selected configuration?</source>
- <translation type="obsolete">確定要刪除所選的設定嗎?</translation>
+ <location line="+162"/>
+ <source>Delete preset</source>
+ <translation>刪除預設定</translation>
 </message>
+</context>
+<context>
+ <name>x264ConfigDialog</name>
 <message>
- <source>Quantiser:</source>
- <translation type="obsolete">量化值:</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+2526"/>
+ <location line="+179"/>
+ <location line="+302"/>
+ <source>%</source>
+ <translation>%</translation>
 </message>
 <message>
- <location line="+405"/>
- <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <location line="-2114"/>
+ <source>0</source>
+ <translation>0</translation>
 </message>
 <message>
- <source>Average Bitrate:</source>
- <translation type="obsolete">平均位元率:</translation>
+ <location line="-664"/>
+ <location line="+669"/>
+ <source>1</source>
+ <translation>1</translation>
 </message>
 <message>
- <location line="-422"/>
- <source>Configuration:</source>
- <translation type="unfinished">設定:</translation>
+ <location line="-649"/>
+ <source>2</source>
+ <translation>2</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+3152"/>
- <source>Delete</source>
- <translation type="unfinished">刪除</translation>
+ <location line="+15"/>
+ <location line="+639"/>
+ <source>3</source>
+ <translation>3</translation>
 </message>
 <message>
- <location line="-2840"/>
- <source>Rate Control</source>
- <translation type="unfinished">比率控制</translation>
+ <location line="-624"/>
+ <source>4</source>
+ <translation>4</translation>
 </message>
 <message>
- <location line="+2889"/>
- <source>Auto-detect</source>
- <translation type="unfinished">自動偵測</translation>
+ <location line="+15"/>
+ <source>5</source>
+ <translation>5</translation>
 </message>
 <message>
- <location line="-2304"/>
- <source>Motion</source>
- <translation type="unfinished">動作</translation>
+ <location line="+614"/>
+ <source>7</source>
+ <translation>7</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Motion Estimation</source>
- <translation type="unfinished">動作估測</translation>
+ <location line="+2583"/>
+ <source>:</source>
+ <translation>:</translation>
 </message>
 <message>
- <location line="+21"/>
- <source>Diamond Search</source>
- <translation type="unfinished">菱形搜尋</translation>
+ <location line="-2578"/>
+ <source>15</source>
+ <translation>15</translation>
 </message>
 <message>
 <location line="+5"/>
- <source>Hexagonal Search</source>
- <translation type="unfinished">六角形搜尋</translation>
+ <source>31</source>
+ <translation>31</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Exhaustive Search</source>
- <translation type="unfinished">徹底搜尋</translation>
+ <location line="-457"/>
+ <source>MB</source>
+ <translation>MB</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Hadamard Exhaustive Search</source>
- <translation type="unfinished">哈達馬德徹底搜尋</translation>
+ <location line="-227"/>
+ <source>1.1</source>
+ <translation>1.1</translation>
 </message>
 <message>
- <location line="+298"/>
- <location line="+450"/>
- <location line="+36"/>
- <source>Disabled</source>
- <translation type="unfinished">停用</translation>
+ <location line="+5"/>
+ <source>1.2</source>
+ <translation>1.2</translation>
 </message>
 <message>
- <location line="-433"/>
- <location line="+2596"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
+ <location line="+5"/>
+ <source>1.3</source>
+ <translation>1.3</translation>
 </message>
 <message>
- <location line="-2591"/>
- <source>Spatial</source>
- <translation type="unfinished">空間性</translation>
+ <location line="+10"/>
+ <source>2.1</source>
+ <translation>2.1</translation>
 </message>
 <message>
 <location line="+5"/>
- <source>Temporal</source>
- <translation type="unfinished">時間性</translation>
+ <source>2.2</source>
+ <translation>2.2</translation>
 </message>
 <message>
- <location line="-1144"/>
- <location line="+1149"/>
- <source>Auto</source>
- <translation type="unfinished">自動</translation>
+ <location line="+10"/>
+ <source>3.1</source>
+ <translation>3.1</translation>
 </message>
 <message>
- <location line="+143"/>
- <source>CABAC</source>
- <translation type="unfinished">CABAC</translation>
+ <location line="+5"/>
+ <source>3.2</source>
+ <translation>3.2</translation>
 </message>
 <message>
- <location line="+280"/>
- <source>Fast</source>
- <translation type="unfinished">快</translation>
+ <location line="+10"/>
+ <source>4.1</source>
+ <translation>4.1</translation>
 </message>
 <message>
 <location line="+5"/>
- <source>Optimal</source>
- <translation type="unfinished">最理想化</translation>
+ <source>4.2</source>
+ <translation>4.2</translation>
 </message>
 <message>
- <location line="+1012"/>
- <source>Adaptive Quantisation</source>
- <translation type="unfinished">適性量化</translation>
+ <location line="+10"/>
+ <source>5.1</source>
+ <translation>5.1</translation>
 </message>
 <message>
- <source>Variance AQ</source>
- <translation type="obsolete">適性量化變化量</translation>
+ <location line="+2977"/>
+ <source>Custom:</source>
+ <comment>multithreading</comment>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+129"/>
- <source>Video Buffer Verifier</source>
- <translation type="unfinished">視訊緩衝校對器</translation>
+ <location line="+688"/>
+ <source>CBR</source>
+ <translation>CBR</translation>
 </message>
 <message>
- <location line="+259"/>
+ <location line="-763"/>
 <source>Add</source>
- <translation type="unfinished">加入</translation>
- </message>
- <message>
- <location line="+193"/>
- <source>Output</source>
- <translation type="unfinished">輸出</translation>
+ <translation>加入</translation>
 </message>
 <message>
- <location line="-3165"/>
- <location line="+669"/>
- <source>1</source>
- <translation type="unfinished">1</translation>
+ <location line="+695"/>
+ <source>FCC</source>
+ <translation>FCC</translation>
 </message>
 <message>
- <location line="-664"/>
- <source>1.1</source>
- <translation type="unfinished">1.1</translation>
+ <location line="+20"/>
+ <source>GBR</source>
+ <translation>GBR</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>1.2</source>
- <translation type="unfinished">1.2</translation>
+ <location line="-199"/>
+ <source>MAC</source>
+ <translation>MAC</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>1.3</source>
- <translation type="unfinished">1.3</translation>
+ <location line="-15"/>
+ <source>PAL</source>
+ <translation>PAL逐行倒相</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>2</source>
- <translation type="unfinished">2</translation>
+ <location line="+257"/>
+ <source>VBR</source>
+ <translation>VBR</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>2.1</source>
- <translation type="unfinished">2.1</translation>
+ <location line="-3621"/>
+ <source>Fast First Pass</source>
+ <translation>快速第1通</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>2.2</source>
- <translation type="unfinished">2.2</translation>
+ <location line="-114"/>
+ <location line="+1149"/>
+ <source>Auto</source>
+ <translation>自動</translation>
 </message>
 <message>
- <location line="+5"/>
- <location line="+639"/>
- <source>3</source>
- <translation type="unfinished">3</translation>
+ <location line="+2283"/>
+ <source>Crop</source>
+ <translation>裁剪</translation>
 </message>
 <message>
- <location line="-634"/>
- <source>3.1</source>
- <translation type="unfinished">3.1</translation>
+ <location line="-1304"/>
+ <location line="+856"/>
+ <source>Edit</source>
+ <translation>編輯</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>3.2</source>
- <translation type="unfinished">3.2</translation>
+ <location line="-1412"/>
+ <source>Fast</source>
+ <translation>快</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>4</source>
- <translation type="unfinished">4</translation>
+ <location line="+1984"/>
+ <source>Film</source>
+ <translation>電影</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>4.1</source>
- <translation type="unfinished">4.1</translation>
+ <location line="-73"/>
+ <source>NTSC</source>
+ <translation>NTSC國家電視系統委員會</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>4.2</source>
- <translation type="unfinished">4.2</translation>
+ <location line="-2349"/>
+ <location line="+2596"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>5</source>
- <translation type="unfinished">5</translation>
+ <location line="-303"/>
+ <source>Show</source>
+ <translation>指示</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>5.1</source>
- <translation type="unfinished">5.1</translation>
+ <location line="-678"/>
+ <source>kbit</source>
+ <translation>kbit</translation>
 </message>
 <message>
- <location line="+594"/>
- <source>0</source>
- <translation type="unfinished">0</translation>
+ <location line="-1457"/>
+ <source>CABAC</source>
+ <translation>CABAC（上下文自適應二進制算術編碼）</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>7</source>
- <translation type="unfinished">7</translation>
+ <location line="+2239"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT709</source>
+ <translation>BT709</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>15</source>
- <translation type="unfinished">15</translation>
+ <location line="-3780"/>
+ <source>Basic</source>
+ <translation>基本</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>31</source>
- <translation type="unfinished">31</translation>
+ <location line="+1393"/>
+ <source>Frame</source>
+ <translation>幀</translation>
 </message>
 <message>
- <location line="+2506"/>
- <source>Pixel Aspect Ratio</source>
- <translation type="unfinished">像素外觀比例</translation>
+ <location line="+412"/>
+ <source>Minimum:</source>
+ <translation>最小:</translation>
 </message>
 <message>
- <location line="+18"/>
- <source>As Input</source>
- <translation type="unfinished">另輸出為</translation>
+ <location line="+1796"/>
+ <source>SECAM</source>
+ <translation>SECAM順序彩色與記憶</translation>
 </message>
 <message>
- <location line="+214"/>
- <source>Crop</source>
- <translation type="unfinished">剪裁</translation>
+ <location line="+209"/>
+ <source>YCgCo</source>
+ <translation>YCgCo</translation>
 </message>
 <message>
- <location line="-822"/>
- <source>Normal</source>
- <translation type="unfinished">一般</translation>
+ <location line="-740"/>
+ <source>Zones</source>
+ <translation>緩衝區</translation>
 </message>
 <message>
- <location line="+1125"/>
- <source>VBR</source>
- <translation type="unfinished">VBR</translation>
+ <location line="-58"/>
+ <source>Maximum Macroblocks per Slice:</source>
+ <translation>切割每幀最大宏塊</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>CBR</source>
- <translation type="unfinished">CBR</translation>
+ <location line="-22"/>
+ <source>bytes</source>
+ <translation>bytes位元</translation>
 </message>
 <message>
- <location line="-3949"/>
- <source>x264 Configuraton</source>
- <translation type="unfinished"></translation>
+ <location line="-1796"/>
+ <location line="+450"/>
+ <location line="+36"/>
+ <source>Disabled</source>
+ <translation>停用</translation>
 </message>
 <message>
- <location line="+90"/>
- <source>General</source>
- <translation type="unfinished"></translation>
+ <location line="-453"/>
+ <source>Direct Prediction Mode:</source>
+ <translation>直接預測模式</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Basic</source>
- <translation type="unfinished"></translation>
+ <location line="+2270"/>
+ <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
+ <translation>這些設定只是建議播放設備，使用您自擔風險。</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Use advanced configuration</source>
- <translation type="unfinished"></translation>
+ <location line="-548"/>
+ <source>VBV Buffer Size:</source>
+ <translation>VBV 緩衝容量 :</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Profile:</source>
- <translation type="unfinished"></translation>
+ <location line="-1715"/>
+ <source>Weighted Prediction for P-frames:</source>
+ <translation>P-幀的加權預測:</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Preset:</source>
- <translation type="unfinished"></translation>
+ <location line="+1203"/>
+ <source>Maximum Quantiser Step:</source>
+ <translation>最大量化步驟:</translation>
 </message>
 <message>
- <location line="+51"/>
- <source>Tuning:</source>
- <translation type="unfinished"></translation>
+ <location line="+537"/>
+ <source>Maximum Size per Slice:</source>
+ <translation>切割每幀最大容量</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>IDC Level:</source>
- <translation type="unfinished"></translation>
+ <location line="-264"/>
+ <source>Variance AQ:</source>
+ <translation>可變 AQ:</translation>
 </message>
 <message>
- <location line="+133"/>
- <source>Fast Decode</source>
- <translation type="unfinished"></translation>
+ <location line="-2149"/>
+ <source>Advanced Rate Control</source>
+ <translation>進階速率控制(RC)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Zero Latency</source>
- <translation type="unfinished"></translation>
+ <location line="+3007"/>
+ <source>Video Format:</source>
+ <translation>影片格式 :</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Fast First Pass</source>
- <translation type="unfinished"></translation>
+ <location line="-265"/>
+ <source>Generate fake interlaced</source>
+ <translation>生成假去錯</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Threads </source>
- <translation type="unfinished"></translation>
+ <location line="-2247"/>
+ <source>Motion Vector</source>
+ <translation>向量運動</translation>
 </message>
 <message>
- <location line="+36"/>
- <source>Target Video Size:</source>
- <translation type="unfinished"></translation>
+ <location line="-766"/>
+ <source>Constant Quantiser (Single Pass)</source>
+ <translation>恆定量化器(QP)(1通)</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Constant Bitrate (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="+2040"/>
+ <source>I and P-frame Quantiser Ratio:</source>
+ <translation>P:I , P-幀量化率:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Constant Quantiser (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="+872"/>
+ <source>Enforce Repeatability</source>
+ <translation>強制重播</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Constant Rate Factor (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="-731"/>
+ <source>P and B-frame Quantiser Ratio:</source>
+ <translation>B:P, B-幀量化率:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Video Size (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="-675"/>
+ <source>GOP Size:</source>
+ <translation>GOP(圖像群組) 大小:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Average Bitrate (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="-32"/>
+ <source>B-frame Bias:</source>
+ <translation>B 幀偏好:</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Encoding Mode:</source>
- <translation type="unfinished"></translation>
+ <location line="-883"/>
+ <source>Hexagonal Search</source>
+ <translation>六角形搜尋</translation>
 </message>
 <message>
- <location line="+82"/>
- <location line="+200"/>
- <source>0 (High Quality)</source>
- <translation type="unfinished"></translation>
+ <location line="-609"/>
+ <source>Target Video Size:</source>
+ <translation>目標影片大小</translation>
 </message>
 <message>
- <location line="-177"/>
- <location line="+200"/>
- <location line="+1649"/>
- <source>Quantiser</source>
- <translation type="unfinished"></translation>
+ <location line="+1060"/>
+ <source>8x8 DCT Spatial Transform</source>
+ <translation>8 x 8 DCT 空間變換</translation>
 </message>
 <message>
- <location line="-1826"/>
- <location line="+200"/>
- <source>51 (Low Quality)</source>
- <translation type="unfinished"></translation>
+ <location line="-354"/>
+ <source>11 (Best)</source>
+ <translation>11 (最好)</translation>
 </message>
 <message>
- <location line="-101"/>
- <source>Advanced RC</source>
- <translation type="unfinished"></translation>
+ <location line="-40"/>
+ <source>1 (Fast)</source>
+ <translation>1 (快)</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Advanced Rate Control</source>
- <translation type="unfinished"></translation>
+ <location line="+401"/>
+ <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
+ <translation>8x8，8x16和16x8 P-幀內預測塊狀</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Maximum Constant Rate Factor</source>
- <translation type="unfinished"></translation>
+ <location line="+748"/>
+ <source>Noise Reduction:</source>
+ <translation>降低雜訊</translation>
 </message>
 <message>
- <location line="+158"/>
- <source>Macroblock-tree Rate Control</source>
- <translation type="unfinished"></translation>
+ <location line="-433"/>
+ <source>Non-strict (Not Blu-ray Compatible)</source>
+ <translation>非嚴格（不與Blu-ray藍光相容）</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Frametype Lookahead:</source>
- <translation type="unfinished"></translation>
+ <location line="+634"/>
+ <source>Quantiser Control</source>
+ <translation>量化控制</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+2490"/>
- <source>frames</source>
- <translation type="unfinished"></translation>
+ <location line="-994"/>
+ <source>Constrained Intra Prediction</source>
+ <translation>幀內預測的約束</translation>
 </message>
 <message>
- <location line="-2466"/>
- <source>Sequence Parameter Set Identifer:</source>
- <translation type="unfinished"></translation>
+ <location line="-989"/>
+ <source>Average Bitrate (Two Pass)</source>
+ <translation>平均位元率(ABR)(2通)</translation>
 </message>
 <message>
- <location line="+91"/>
- <source>Motion Estimation Method:</source>
- <translation type="unfinished"></translation>
+ <location line="+2991"/>
+ <source>BluRay compatibility</source>
+ <translation>BluRay兼容</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Uneven Multi-hexagonal Search</source>
- <translation type="unfinished"></translation>
+ <location line="-729"/>
+ <source>Quantiser Curve Compression</source>
+ <translation>量化曲線壓縮(QCComp)</translation>
 </message>
 <message>
- <location line="+52"/>
- <source>1 (Fast)</source>
- <translation type="unfinished"></translation>
+ <location line="-1221"/>
+ <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
+ <translation>8x8，8x16和16x8 B-幀內預測塊狀</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Subpixel Refinement</source>
- <translation type="unfinished"></translation>
+ <location line="+442"/>
+ <source>I-frames</source>
+ <translation>I-幀(內幀,前幀)</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>10 (Best)</source>
- <translation type="unfinished"></translation>
+ <location line="-160"/>
+ <source>B-frames</source>
+ <translation>B-幀 (介於前I幀與後P幀間連續預測幀，例如: IBBBPBBBPBBBPBBBIBBBP....)</translation>
 </message>
 <message>
- <location line="+78"/>
- <source>Motion Vector</source>
- <translation type="unfinished"></translation>
+ <location line="+1525"/>
+ <source>Auto-detect</source>
+ <translation>自動偵測</translation>
 </message>
 <message>
- <location line="+38"/>
- <source>Maximum Motion Vector Length:</source>
- <translation type="unfinished"></translation>
+ <location line="-1375"/>
+ <source>Adaptive B-frame Decision:</source>
+ <translation>自適應 B-幀的決定：</translation>
 </message>
 <message>
- <location line="+70"/>
- <source>Minimum Buffer Between Threads:</source>
- <translation type="unfinished"></translation>
+ <location line="-219"/>
+ <source>Top Field First</source>
+ <translation>頂部首先掃描</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Maximum Motion Vector Search Range:</source>
- <translation type="unfinished"></translation>
+ <location line="+579"/>
+ <source>Inter Luma Quantisation Deadzone:</source>
+ <translation>內明度量化靜區：</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Prediction</source>
- <translation type="unfinished"></translation>
+ <location line="-180"/>
+ <source>Trellis Quantization:</source>
+ <translation>網格量化</translation>
 </message>
 <message>
- <location line="+16"/>
- <source>Weighted References</source>
- <translation type="unfinished"></translation>
+ <location line="+173"/>
+ <source>Intra Luma Quantisation Deadzone:</source>
+ <translation>內明度量化靜區 :</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Weighted References + Duplicates</source>
- <translation type="unfinished"></translation>
+ <location line="+489"/>
+ <source>Reduce Fluctuation Before Curve Compression:</source>
+ <translation>減少波動曲線壓縮之前：</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Direct Prediction Mode:</source>
- <translation type="unfinished"></translation>
+ <location line="+966"/>
+ <source>Component</source>
+ <translation>合成的</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Weighted Prediction for P-frames:</source>
- <translation type="unfinished"></translation>
+ <location line="+63"/>
+ <location line="+63"/>
+ <source>BT470M</source>
+ <translation>BT470M</translation>
 </message>
 <message>
- <location line="+53"/>
- <source>Weighted Prediction for B-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-1782"/>
+ <location line="+6"/>
+ <source>Analysis</source>
+ <translation>分析</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Constrained Intra Prediction</source>
- <translation type="unfinished"></translation>
+ <location line="-1716"/>
+ <source>Zero Latency</source>
+ <translation>零延遲</translation>
 </message>
 <message>
- <location line="+24"/>
- <source>Partition</source>
- <translation type="unfinished"></translation>
+ <location line="+347"/>
+ <source>Maximum Constant Rate Factor</source>
+ <translation>最大恆定速率係數(CRF模式)</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Partition Search</source>
- <translation type="unfinished"></translation>
+ <location line="+2571"/>
+ <source>Multithreading</source>
+ <translation>多線程</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>8x8 DCT Spatial Transform</source>
- <translation type="unfinished"></translation>
+ <location line="-3186"/>
+ <location line="+3152"/>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
- <translation type="unfinished"></translation>
+ <location line="+311"/>
+ <source>Predefined Aspect Ratio:</source>
+ <translation>預定義PAR:</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
- <translation type="unfinished"></translation>
+ <location line="-2529"/>
+ <source>Uneven Multi-hexagonal Search</source>
+ <translation>六角形搜索</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
- <translation type="unfinished"></translation>
+ <location line="-331"/>
+ <source>Advanced RC</source>
+ <translation>進階速率控制(RC)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>8x8 Intra-predicted Blocks</source>
- <translation type="unfinished"></translation>
+ <location line="-342"/>
+ <source>Fast Decode</source>
+ <translation>快速解碼</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>4x4 Intra-predicted Blocks</source>
- <translation type="unfinished"></translation>
+ <location line="+991"/>
+ <source>Weighted References + Duplicates</source>
+ <translation>加權參考+重複</translation>
 </message>
 <message>
- <location line="+26"/>
- <source>Frame</source>
- <translation type="unfinished"></translation>
+ <location line="+2523"/>
+ <source>LOG100</source>
+ <translation>LOG100</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Frame Encoding</source>
- <translation type="unfinished"></translation>
+ <location line="+5"/>
+ <source>LOG316</source>
+ <translation>LOG316</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>Loop Filter:</source>
- <translation type="unfinished"></translation>
+ <location line="-1247"/>
+ <source>Chroma to Luma Quantiser Offset:</source>
+ <translation>從色度到明度量化偏移量：</translation>
 </message>
 <message>
- <location line="+12"/>
- <location line="+1328"/>
- <source>Strength:</source>
- <translation type="unfinished"></translation>
+ <location line="-2405"/>
+ <source>IDC Level:</source>
+ <translation>IDC等級</translation>
 </message>
 <message>
- <location line="-1289"/>
- <source>Threshold:</source>
- <translation type="unfinished"></translation>
+ <location line="+3642"/>
+ <source>Linear</source>
+ <translation>線性</translation>
 </message>
 <message>
- <location line="+35"/>
- <source>Open GOP:</source>
- <translation type="unfinished"></translation>
+ <location line="-1500"/>
+ <source>JVT Matrix</source>
+ <translation>JVT 矩陣</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Normal Mode</source>
- <translation type="unfinished"></translation>
+ <location line="-1058"/>
+ <source>Minimum Buffer Between Threads:</source>
+ <translation>線程間的最小緩衝區:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Blu-ray Mode</source>
- <translation type="unfinished"></translation>
+ <location line="-315"/>
+ <source>Motion</source>
+ <translation>運動</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Interlaced:</source>
- <translation type="unfinished"></translation>
+ <location line="+2482"/>
+ <source>As Input</source>
+ <translation>另輸出為其他輸入檔(保留原始影片的PAR)</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Bottom Field First</source>
- <translation type="unfinished"></translation>
+ <location line="-42"/>
+ <source>Generate Access Unit Delimiters</source>
+ <translation>生成存取單元分隔符號</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Top Field First</source>
- <translation type="unfinished"></translation>
+ <location line="-566"/>
+ <source>Normal</source>
+ <translation>正常</translation>
 </message>
 <message>
- <location line="+30"/>
- <source>Maximum Reference Frames:</source>
- <translation type="unfinished"></translation>
+ <location line="+560"/>
+ <source>Output</source>
+ <translation>輸出</translation>
 </message>
 <message>
- <location line="+39"/>
- <source>B-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-1071"/>
+ <source>Flat Matrix</source>
+ <translation>平面矩陣</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>B-frames as References:</source>
- <translation type="unfinished"></translation>
+ <location line="+1452"/>
+ <location line="+78"/>
+ <location line="+58"/>
+ <source>SMPTE240M</source>
+ <translation>SMPTE240M</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>Strictly Hierarchical Pyramid</source>
- <translation type="unfinished"></translation>
+ <location line="-141"/>
+ <location line="+136"/>
+ <source>SMPTE170M</source>
+ <translation>SMPTE170M</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Non-strict (Not Blu-ray Compatible)</source>
- <translation type="unfinished"></translation>
+ <location line="+38"/>
+ <source>HRD Parameters:</source>
+ <translation>HRD 參數：</translation>
 </message>
 <message>
- <location line="+110"/>
- <source>B-frame Bias:</source>
- <translation type="unfinished"></translation>
+ <location line="-3423"/>
+ <location line="+200"/>
+ <source>0 (High Quality)</source>
+ <translation>0 (高品質)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Maximum Consecutive B-frames:</source>
- <translation type="unfinished"></translation>
+ <location line="+1024"/>
+ <source>B-frames as References:</source>
+ <translation>B 幀作為參考:</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Adaptive B-frame Decision:</source>
- <translation type="unfinished"></translation>
+ <location line="+2131"/>
+ <source>Colour Matrix:</source>
+ <translation>顏色矩陣：</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>I-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-3480"/>
+ <source>Constant Bitrate (Single Pass)</source>
+ <translation>固定位元率(CBR)(1通)</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>GOP Size:</source>
- <translation type="unfinished"></translation>
+ <location line="+3624"/>
+ <source>Full Range Samples</source>
+ <translation>全範圍色度樣品</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Minimum:</source>
- <translation type="unfinished"></translation>
+ <location line="-1705"/>
+ <source>Quantisation Matrix</source>
+ <translation>量化矩陣</translation>
 </message>
 <message>
- <location line="+33"/>
- <source>Maximum:</source>
- <translation type="unfinished"></translation>
+ <location line="-1748"/>
+ <location line="+200"/>
+ <source>51 (Low Quality)</source>
+ <translation>51 (低品質)</translation>
 </message>
 <message>
- <location line="+32"/>
- <source>I-frame Threshold:</source>
- <translation type="unfinished"></translation>
+ <location line="+1034"/>
+ <source>Optimal</source>
+ <translation>優化</translation>
 </message>
 <message>
- <location line="+36"/>
- <source>Periodic Intra Refresh</source>
- <translation type="unfinished"></translation>
+ <location line="-942"/>
+ <location line="+2490"/>
+ <source>frames</source>
+ <translation>幀</translation>
 </message>
 <message>
- <location line="+24"/>
- <location line="+6"/>
- <source>Analysis</source>
- <translation type="unfinished"></translation>
+ <location line="-1269"/>
+ <source>Final Macroblock Only</source>
+ <translation>最終的宏塊(更快，中等品質)</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Mixed References</source>
- <translation type="unfinished"></translation>
+ <location line="-682"/>
+ <source>Weighted Prediction for B-frames</source>
+ <translation>B-幀的加權預測</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Chroma Motion Estimation</source>
- <translation type="unfinished"></translation>
+ <location line="+1441"/>
+ <source>Auto Variance AQ</source>
+ <translation>自動變量(AQ):</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Trellis Quantization:</source>
- <translation type="unfinished"></translation>
+ <location line="+199"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
 </message>
 <message>
- <location line="+11"/>
- <source>Final Macroblock Only</source>
- <translation type="unfinished"></translation>
+ <location line="-81"/>
+ <source>Initial VBV Buffer Occupancy:</source>
+ <translation>初始 VBV 緩衝區佔用：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Always On</source>
- <translation type="unfinished"></translation>
+ <location line="-1752"/>
+ <source>Maximum Motion Vector Length:</source>
+ <translation>最大向量運動長度:</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Fast Skip Detection on P-frames</source>
- <translation type="unfinished"></translation>
+ <location line="+2560"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT470BG</source>
+ <translation>BT470BG</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>DCT Decimation on P-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-3768"/>
+ <source>Preset:</source>
+ <translation>預設定:</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Psychovisual Rate Distortion Optimisation:</source>
- <translation type="unfinished"></translation>
+ <location line="+3291"/>
+ <source>Pixel Aspect Ratio</source>
+ <translation>像素寬高比(PAR)-(不同於外觀比的顯示寬高比(DAR))</translation>
 </message>
 <message>
- <location line="+37"/>
- <source>Psychovisual Trellis:</source>
- <translation type="unfinished"></translation>
+ <location line="-1316"/>
+ <source>Fast Skip Detection on P-frames</source>
+ <translation>快速跳過檢測 P-幀 (場景中如有虛影時按取消)</translation>
 </message>
 <message>
- <location line="+37"/>
- <source>Noise Reduction:</source>
- <translation type="unfinished"></translation>
+ <location line="-484"/>
+ <source>Normal Mode</source>
+ <translation>正常模式</translation>
 </message>
 <message>
- <location line="+36"/>
- <source>Luma Quantisation Deadzone</source>
- <translation type="unfinished"></translation>
+ <location line="-160"/>
+ <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
+ <translation>4x4，4x8和8x4 P-幀內預測塊狀</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Intra Luma Quantisation Deadzone:</source>
- <translation type="unfinished"></translation>
+ <location line="+589"/>
+ <source>Mixed References</source>
+ <translation>混合參考</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Inter Luma Quantisation Deadzone:</source>
- <translation type="unfinished"></translation>
+ <location line="+877"/>
+ <source>Advanced 1</source>
+ <translation>進階 1</translation>
 </message>
 <message>
- <location line="+66"/>
- <source>Quantisation Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="+313"/>
+ <source>Advanced 2</source>
+ <translation>進階 2</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Flat Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="-2699"/>
+ <location line="+200"/>
+ <location line="+1649"/>
+ <source>Quantiser</source>
+ <translation>量化器</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>JVT Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="+1455"/>
+ <source>SMPTEL170M</source>
+ <translation>SMPTEL170M</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Custom Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="-309"/>
+ <source>16:15 (PAL 4:3)</source>
+ <translation>16:15 (PAL 4:3)</translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+856"/>
- <source>Edit</source>
- <translation type="unfinished"></translation>
+ <location line="-2656"/>
+ <source>Sequence Parameter Set Identifer:</source>
+ <translation>序列參數設定識別碼</translation>
 </message>
 <message>
- <location line="-809"/>
- <source>Quantiser Control</source>
- <translation type="unfinished"></translation>
+ <location line="+1134"/>
+ <source>Periodic Intra Refresh</source>
+ <translation>週期性幀內更新</translation>
 </message>
 <message>
- <location line="+35"/>
- <source>Maximum Quantiser:</source>
- <translation type="unfinished"></translation>
+ <location line="-480"/>
+ <location line="+1328"/>
+ <source>Strength:</source>
+ <translation> 強度：</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>I and P-frame Quantiser Ratio:</source>
- <translation type="unfinished"></translation>
+ <location line="-1858"/>
+ <source>Hadamard Exhaustive Search</source>
+ <translation>Hadamard徹底搜尋（TESA）</translation>
 </message>
 <message>
- <location line="+85"/>
- <location line="+179"/>
- <location line="+302"/>
- <source>%</source>
- <translation type="unfinished"></translation>
+ <location line="+2071"/>
+ <source>Slices per Frame:</source>
+ <translation>切割每幀:</translation>
 </message>
 <message>
- <location line="-459"/>
- <source>Maximum Quantiser Step:</source>
- <translation type="unfinished"></translation>
+ <location line="-1129"/>
+ <source>Maximum:</source>
+ <translation>最大 :</translation>
 </message>
 <message>
- <location line="+34"/>
- <source>P and B-frame Quantiser Ratio:</source>
- <translation type="unfinished"></translation>
+ <location line="+737"/>
+ <source>Quantiser Curve Compression:</source>
+ <translation>量化曲線壓縮(QCComp)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Average Bitrate Tolerance:</source>
- <translation type="unfinished"></translation>
+ <location line="+858"/>
+ <source>64:45 (PAL 16:9)</source>
+ <translation>64:45 (PAL 16:9)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Chroma to Luma Quantiser Offset:</source>
- <translation type="unfinished"></translation>
+ <location line="-3418"/>
+ <source>Profile:</source>
+ <translation>設定檔：</translation>
 </message>
 <message>
- <location line="+34"/>
- <source>Minimum Quantiser:</source>
- <translation type="unfinished"></translation>
+ <location line="+1526"/>
+ <source>Interlaced:</source>
+ <translation>純交錯模式:</translation>
 </message>
 <message>
- <location line="+48"/>
- <source>Quantiser Curve Compression</source>
- <translation type="unfinished"></translation>
+ <location line="-650"/>
+ <source>Exhaustive Search</source>
+ <translation>徹底搜尋</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Quantiser Curve Compression:</source>
- <translation type="unfinished"></translation>
+ <location line="-946"/>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
 </message>
 <message>
- <location line="+45"/>
- <source>Reduce Fluctuation Before Curve Compression:</source>
- <translation type="unfinished"></translation>
+ <location line="+1373"/>
+ <source>Partition</source>
+ <translation>畫分</translation>
 </message>
 <message>
- <location line="+70"/>
- <source>Reduce Fluctuation After Curve Compression:</source>
- <translation type="unfinished"></translation>
+ <location line="-147"/>
+ <source>Maximum Motion Vector Search Range:</source>
+ <translation>最大向量運動尋找範圍:</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Variance AQ:</source>
- <translation type="unfinished"></translation>
+ <location line="+243"/>
+ <source>Loop Filter:</source>
+ <translation>循環濾鏡器:</translation>
 </message>
 <message>
- <location line="+18"/>
- <source>Auto Variance AQ</source>
- <translation type="unfinished"></translation>
+ <location line="+175"/>
+ <source>Maximum Reference Frames:</source>
+ <translation>最大參考幀數：</translation>
 </message>
 <message>
- <location line="+91"/>
- <source>Advanced 1</source>
- <translation type="unfinished"></translation>
+ <location line="-713"/>
+ <source>Diamond Search</source>
+ <translation>菱形搜尋</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Maximum VBV Bitrate:</source>
- <translation type="unfinished"></translation>
+ <location line="+2085"/>
+ <source>Slicing</source>
+ <translation>切割</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Initial VBV Buffer Occupancy:</source>
- <translation type="unfinished"></translation>
+ <location line="-3057"/>
+ <source>x264 Configuraton</source>
+ <translation>x264 配置</translation>
 </message>
 <message>
- <location line="+16"/>
- <source>kbit</source>
- <translation type="unfinished"></translation>
+ <location line="+1295"/>
+ <source>Weighted References</source>
+ <translation>加權參考</translation>
 </message>
 <message>
- <location line="+65"/>
- <source>kbit/s</source>
- <translation type="unfinished"></translation>
+ <location line="-344"/>
+ <source>Motion Estimation</source>
+ <translation>運動估計</translation>
 </message>
 <message>
- <location line="+22"/>
- <source>VBV Buffer Size:</source>
- <translation type="unfinished"></translation>
+ <location line="+397"/>
+ <source>Spatial</source>
+ <translation>空間性</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Slicing</source>
- <translation type="unfinished"></translation>
+ <location line="+1579"/>
+ <source>Video Buffer Verifier</source>
+ <translation>影片緩衝驗證器(VBV)</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Slices per Frame:</source>
- <translation type="unfinished"></translation>
+ <location line="+704"/>
+ <location line="+46"/>
+ <location line="+58"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>Undefined</source>
+ <translation>未定義</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Maximum Size per Slice:</source>
- <translation type="unfinished"></translation>
+ <source>Custom:</source>
+ <translation type="vanished">自訂 :</translation>
 </message>
 <message>
- <location line="+16"/>
- <source>bytes</source>
- <translation type="unfinished"></translation>
+ <location line="-3050"/>
+ <source>Macroblock-tree Rate Control</source>
+ <translation>宏塊-樹速率控制</translation>
 </message>
 <message>
- <location line="+22"/>
- <source>Maximum Macroblocks per Slice:</source>
- <translation type="unfinished"></translation>
+ <location line="+2713"/>
+ <source>8:9 (NTSC 4:3)</source>
+ <translation>8:9 (NTSC 4:3)</translation>
 </message>
 <message>
- <location line="+58"/>
- <source>Zones</source>
- <translation type="unfinished"></translation>
+ <location line="-2255"/>
+ <source>Prediction</source>
+ <translation>預測</translation>
 </message>
 <message>
- <location line="+62"/>
- <source>Advanced 2</source>
- <translation type="unfinished"></translation>
+ <location line="+1963"/>
+ <source>Disable</source>
+ <translation>停用</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Multithreading</source>
- <translation type="unfinished"></translation>
+ <location line="-627"/>
+ <source>Minimum Quantiser:</source>
+ <translation>最小量化</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Disable</source>
- <translation type="unfinished"></translation>
+ <location line="-649"/>
+ <source>I-frame Threshold:</source>
+ <translation>I-幀線程:</translation>
 </message>
 <message>
- <location line="+19"/>
+ <location line="+1451"/>
 <source>Custom:</source>
- <comment>multithreading</comment>
- <translation type="unfinished"></translation>
+ <comment>PAR</comment>
+ <translatorcomment>PAR</translatorcomment>
+ <translation>自訂 :</translation>
 </message>
 <message>
- <location line="+37"/>
- <source>Enforce Repeatability</source>
- <translation type="unfinished"></translation>
+ <location line="-998"/>
+ <source>Maximum Quantiser:</source>
+ <translation>最大量化:</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Slice-based Threading</source>
- <translation type="unfinished"></translation>
+ <location line="-319"/>
+ <source>DCT Decimation on P-frames</source>
+ <translation>DCT 抽取對 P 幀</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Custom Threaded Lookahead Buffer:</source>
- <translation type="unfinished"></translation>
+ <location line="-1931"/>
+ <source>Tuning:</source>
+ <translation>調音:</translation>
 </message>
 <message>
- <location line="+59"/>
- <source>Output 1</source>
- <translation type="unfinished"></translation>
+ <location line="+790"/>
+ <source>Motion Estimation Method:</source>
+ <translation>運動估計方法 :</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Generate Access Unit Delimiters</source>
- <translation type="unfinished"></translation>
+ <location line="-563"/>
+ <source>Video Size (Two Pass)</source>
+ <translation>影片大小(2通)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>BluRay compatibility</source>
- <translation type="unfinished"></translation>
+ <location line="-294"/>
+ <source>Use advanced configuration</source>
+ <translation>使用進階配置</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Generate fake interlaced</source>
- <translation type="unfinished"></translation>
+ <location line="+1494"/>
+ <source>Open GOP:</source>
+ <translation>開啟GOP(圖像群組)</translation>
 </message>
 <message>
- <location line="+18"/>
- <source>Custom:</source>
- <comment>PAR</comment>
- <translation type="unfinished"></translation>
+ <location line="-101"/>
+ <source>Frame Encoding</source>
+ <translation>幀編碼</translation>
 </message>
 <message>
- <location line="+59"/>
- <source>:</source>
- <translation type="unfinished"></translation>
+ <location line="+119"/>
+ <source>Blu-ray Mode</source>
+ <translation>藍ray光模式</translation>
 </message>
 <message>
- <location line="+35"/>
- <source>Predefined Aspect Ratio:</source>
- <translation type="unfinished"></translation>
+ <location line="+1925"/>
+ <source>32:27 (NTSC 16:9)</source>
+ <translation>32:27 (NTSC 16:9)</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>16:15 (PAL 4:3)</source>
- <translation type="unfinished"></translation>
+ <location line="-1672"/>
+ <source>Maximum Consecutive B-frames:</source>
+ <translation>最大的連續 B 幀：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>64:45 (PAL 16:9)</source>
- <translation type="unfinished"></translation>
+ <location line="-514"/>
+ <source>Temporal</source>
+ <translation>時間性</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>8:9 (NTSC 4:3)</source>
- <translation type="unfinished"></translation>
+ <location line="+2268"/>
+ <source>Overscan:</source>
+ <translation>過度掃描</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>32:27 (NTSC 16:9)</source>
- <translation type="unfinished"></translation>
+ <location line="-2060"/>
+ <source>Threshold:</source>
+ <translation>界限</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>Output 2</source>
- <translation type="unfinished"></translation>
+ <location line="+1812"/>
+ <source>Output 1</source>
+ <translation>輸出 1:</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Video Usability Information</source>
- <translation type="unfinished"></translation>
+ <location line="+208"/>
+ <source>Output 2</source>
+ <translation>輸出 2:</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
- <translation type="unfinished"></translation>
+ <location line="-2118"/>
+ <source>4x4 Intra-predicted Blocks</source>
+ <translation>4x4 內預測塊狀</translation>
 </message>
 <message>
- <location line="+28"/>
- <source>Overscan:</source>
- <translation type="unfinished"></translation>
+ <location line="+1335"/>
+ <source>Adaptive Quantisation</source>
+ <translation>自適應量化(AQ)</translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+46"/>
- <location line="+58"/>
- <location line="+63"/>
- <location line="+73"/>
- <source>Undefined</source>
- <translation type="unfinished"></translation>
+ <location line="-728"/>
+ <source>Always On</source>
+ <translation>始終在（緩慢，品質最好）</translation>
 </message>
 <message>
- <location line="-235"/>
- <source>Show</source>
- <translation type="unfinished"></translation>
+ <location line="-420"/>
+ <source>Bottom Field First</source>
+ <translation>底部首先掃描</translation>
 </message>
 <message>
- <location line="+28"/>
- <source>Video Format:</source>
- <translation type="unfinished"></translation>
+ <location line="+496"/>
+ <source>Psychovisual Trellis:</source>
+ <translation>心理網格(Psy網格-此版本停用)：</translation>
 </message>
 <message>
- <location line="+18"/>
- <source>Component</source>
- <translation type="unfinished"></translation>
+ <location line="-2056"/>
+ <source>General</source>
+ <translation>一般</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>PAL</source>
- <translation type="unfinished"></translation>
+ <location line="+2129"/>
+ <source>Luma Quantisation Deadzone</source>
+ <translation>明度量化靜區：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>NTSC</source>
- <translation type="unfinished"></translation>
+ <location line="-174"/>
+ <source>Chroma Motion Estimation</source>
+ <translation>色度運動估計(CME)</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>SECAM</source>
- <translation type="unfinished"></translation>
+ <location line="+1269"/>
+ <source>Custom Threaded Lookahead Buffer:</source>
+ <translation>自訂線程預測先行緩衝區：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>MAC</source>
- <translation type="unfinished"></translation>
+ <location line="-1858"/>
+ <source>8x8 Intra-predicted Blocks</source>
+ <translation>8x8 內預測塊狀</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Colour Primaries:</source>
- <translation type="unfinished"></translation>
+ <location line="-1096"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
 </message>
 <message>
- <location line="+15"/>
- <location line="+63"/>
- <location line="+73"/>
- <source>BT709</source>
- <translation type="unfinished"></translation>
+ <location line="+2575"/>
+ <source>Maximum VBV Bitrate:</source>
+ <translation>最大 VBV 位元率 :</translation>
 </message>
 <message>
- <location line="-131"/>
- <location line="+63"/>
- <source>BT470M</source>
- <translation type="unfinished"></translation>
+ <location line="-2511"/>
+ <source>Encoding Mode:</source>
+ <translation>編碼模式</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+63"/>
- <location line="+73"/>
- <source>BT470BG</source>
- <translation type="unfinished"></translation>
+ <location line="+1321"/>
+ <source>Strictly Hierarchical Pyramid</source>
+ <translation>金字塔嚴格的等級制度</translation>
 </message>
 <message>
- <location line="-131"/>
- <location line="+136"/>
- <source>SMPTE170M</source>
- <translation type="unfinished"></translation>
+ <location line="-325"/>
+ <source>Partition Search</source>
+ <translation>畫分搜尋</translation>
 </message>
 <message>
- <location line="-131"/>
- <location line="+78"/>
- <location line="+58"/>
- <source>SMPTE240M</source>
- <translation type="unfinished"></translation>
+ <location line="+1885"/>
+ <source>Slice-based Threading</source>
+ <translation>切割基本線程</translation>
 </message>
 <message>
- <location line="-131"/>
- <source>Film</source>
- <translation type="unfinished"></translation>
+ <location line="-731"/>
+ <source>Average Bitrate Tolerance:</source>
+ <translation>平均位元率誤差(ABR)</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Transfer Characteristics:</source>
- <translation type="unfinished"></translation>
+ <location line="-2550"/>
+ <source>Configuration:</source>
+ <translation>配置:</translation>
 </message>
 <message>
- <location line="+30"/>
- <source>Linear</source>
- <translation type="unfinished"></translation>
+ <location line="+1030"/>
+ <source>Subpixel Refinement</source>
+ <translation>次像素精細化(次ME)</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>LOG100</source>
- <translation type="unfinished"></translation>
+ <location line="+2734"/>
+ <source>Transfer Characteristics:</source>
+ <translation>轉移特性：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>LOG316</source>
- <translation type="unfinished"></translation>
+ <location line="-1679"/>
+ <source>Psychovisual Rate Distortion Optimisation:</source>
+ <translation>心理視覺優化(Psy RDO)：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>SMPTEL170M</source>
- <translation type="unfinished"></translation>
+ <location line="+1478"/>
+ <source>Video Usability Information</source>
+ <translation>影片可用性資訊</translation>
 </message>
 <message>
- <location line="+28"/>
- <source>Colour Matrix:</source>
- <translation type="unfinished"></translation>
+ <location line="-3196"/>
+ <source>Constant Rate Factor (Single Pass)</source>
+ <translation>恆定速率係數(CRF)(1通)</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>FCC</source>
- <translation type="unfinished"></translation>
+ <location line="+439"/>
+ <source>Frametype Lookahead:</source>
+ <translation>幀類型預測先行:</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>GBR</source>
- <translation type="unfinished"></translation>
+ <location line="+2895"/>
+ <source>Colour Primaries:</source>
+ <translation>基色 :</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>YCgCo</source>
- <translation type="unfinished"></translation>
+ <location line="-3393"/>
+ <source>Threads </source>
+ <translation>線程</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>HRD Parameters:</source>
- <translation type="unfinished"></translation>
+ <location line="+3640"/>
+ <source>Chroma Sample Location:</source>
+ <translation>色度採樣位置：</translation>
 </message>
 <message>
- <location line="+43"/>
- <source>Chroma Sample Location:</source>
- <translation type="unfinished"></translation>
+ <location line="-1186"/>
+ <source>Reduce Fluctuation After Curve Compression:</source>
+ <translation>減少波動曲線壓縮之後：</translation>
 </message>
 <message>
- <location line="+33"/>
- <source>Full Range Samples</source>
- <translation type="unfinished"></translation>
+ <location line="-459"/>
+ <source>Custom Matrix</source>
+ <translation>自訂矩陣</translation>
 </message>
 </context>
 <context>
 <name>x264CustomMatrixDialog</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+16"/>
- <source>x264 Custom Matrix</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Intra 4x4</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+2374"/>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
 <message>
- <location line="+28"/>
+ <location line="-2314"/>
 <location line="+446"/>
 <location line="+446"/>
 <location line="+703"/>
 <source>Luma:</source>
- <translation type="unfinished"></translation>
+ <translation>Luma明度:</translation>
 </message>
 <message>
 <location line="-1385"/>
 <location line="+446"/>
 <source>Chroma U/V:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-238"/>
- <source>Inter 4x4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+446"/>
- <source>Intra 8x8</source>
- <translation type="unfinished"></translation>
+ <translation>Chroma色度 U/V:</translation>
 </message>
 <message>
- <location line="+703"/>
- <source>Inter 8x8</source>
- <translation type="unfinished"></translation>
+ <location line="+1668"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <location line="+727"/>
+ <location line="-30"/>
 <source>Load File</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>載入檔案</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Cancel</source>
- <translation type="unfinished"></translation>
+ <location line="-2338"/>
+ <source>x264 Custom Matrix</source>
+ <translation>x264自訂矩陣</translation>
 </message>
-</context>
-<context>
- <name>x264Dialog</name>
 <message>
- <source>Quantiser:</source>
- <translation type="obsolete">量化值:</translation>
+ <location line="+462"/>
+ <source>Inter 4x4</source>
+ <translation>Inter內 4x4</translation>
 </message>
 <message>
- <source>MB</source>
- <translation type="obsolete">MB</translation>
+ <location line="+1149"/>
+ <source>Inter 8x8</source>
+ <translation>Inter內 8x8</translation>
 </message>
 <message>
- <source>Average Bitrate:</source>
- <translation type="obsolete">平均位元率:</translation>
+ <location line="-1595"/>
+ <source>Intra 4x4</source>
+ <translation>Intra內 4x4</translation>
 </message>
-</context>
-<context>
- <name>x264ZoneTableModel</name>
 <message>
- <source>Mode</source>
- <translation type="obsolete">模式</translation>
+ <location line="+892"/>
+ <source>Intra 8x8</source>
+ <translation>Intra內 8x8</translation>
 </message>
 </context>
 <context>
 <name>x265</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
- <source>Not coded</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+594"/>
+ <source>MB</source>
+ <translation>MB</translation>
 </message>
 <message>
- <location line="+0"/>
- <source>this mode has not been implemented
-</source>
- <translation type="unfinished"></translation>
+ <location line="-410"/>
+ <source>none</source>
+ <translation>無</translation>
 </message>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
- <source>none</source>
- <translation type="unfinished"></translation>
+ <location line="+568"/>
+ <location line="+69"/>
+ <location line="+14"/>
+ <source>Error</source>
+ <translation>錯誤</translation>
 </message>
 <message>
- <location line="+33"/>
- <source>Custom</source>
- <translation type="unfinished">自訂</translation>
+ <location line="-124"/>
+ <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+ <translation>宏塊優化需要平差自適應量化(AQ)來啟用，將自動停用宏塊樹優化，您要繼續嗎？</translation>
 </message>
 <message>
- <location line="+357"/>
- <source>Target Bitrate:</source>
- <translation type="unfinished"></translation>
+ <location line="+56"/>
+ <source>Save Profile</source>
+ <translation>儲存設定檔</translation>
 </message>
 <message>
- <location line="+1"/>
- <location line="+20"/>
- <source>kbit/s</source>
- <translation type="unfinished"></translation>
+ <location line="-174"/>
+ <source>Target Video Size:</source>
+ <translation>目標影片大小:</translation>
 </message>
 <message>
- <location line="-15"/>
- <source>Quantiser:</source>
- <translation type="unfinished">量化值:</translation>
+ <location line="+246"/>
+ <source>Do you really want to delete the </source>
+ <translation>你打算刪除?</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Quality:</source>
- <translation type="unfinished"></translation>
+ <location line="-87"/>
+ <source>Cannot load preset</source>
+ <translation>不能載入預設定</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Target Video Size:</source>
- <translation type="unfinished"></translation>
+ <location line="+89"/>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <location line="-624"/>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Average Bitrate:</source>
- <translation type="unfinished">平均位元率:</translation>
+ <location line="+604"/>
+ <source>Cannot save preset</source>
+ <translation>無法儲存預設定</translation>
 </message>
 <message>
- <location line="+101"/>
- <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Variance Adaptive Quantisation will automatically be enabled.
-
-Do you wish to continue?</source>
- <translation type="unfinished"></translation>
+ <location line="-237"/>
+ <source>Quantiser:</source>
+ <translation>量化值:</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.
-
-Do you wish to continue?</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
+ <source>Not coded</source>
+ <translation>非碼</translation>
 </message>
 <message>
- <location line="+41"/>
- <location line="+69"/>
- <location line="+14"/>
- <source>Error</source>
- <translation type="unfinished">錯誤</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="-5"/>
+ <location line="+20"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
 </message>
 <message>
- <location line="-83"/>
- <source>Cannot load preset</source>
- <translation type="unfinished"></translation>
+ <location line="+213"/>
+ <source>Replace the following preset ?:</source>
+ <translation>要替代以下預設定?</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>Save Profile</source>
- <translation type="unfinished"></translation>
+ <location line="-234"/>
+ <source>Target Bitrate:</source>
+ <translation>目標位元率：</translation>
 </message>
 <message>
- <location line="+45"/>
- <source>Overwrite</source>
- <translation type="unfinished"></translation>
+ <location line="+20"/>
+ <source>Average Bitrate:</source>
+ <translation>平均位元率(ABR):</translation>
 </message>
 <message>
- <location line="+0"/>
- <source>Replace the following preset ?:</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+0"/>
+ <source>this mode has not been implemented
+</source>
+ <translation>這種模式沒有得到執行</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Cannot save preset</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="-10"/>
+ <source>Quality:</source>
+ <translation>品質:</translation>
 </message>
 <message>
- <location line="+14"/>
+ <location line="+247"/>
 <source>Cannot delete custom profile</source>
- <translation type="unfinished"></translation>
+ <translation>不能刪除自訂的設定檔</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Do you really want to delete the </source>
- <translation type="unfinished"></translation>
+ <location line="-23"/>
+ <source>Overwrite</source>
+ <translation>複寫</translation>
 </message>
 <message>
- <location line="+1"/>
- <source> profile ?.
-If it is a system profile it will be recreated next time.</source>
- <translation type="unfinished"></translation>
+ <location line="-113"/>
+ <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="+1"/>
+ <location line="+142"/>
 <source>Delete preset</source>
- <translation type="unfinished"></translation>
+ <translation>刪除預設定</translation>
 </message>
 <message>
- <location line="+0"/>
- <source>Delete</source>
- <translation type="unfinished">刪除</translation>
+ <location line="-1"/>
+ <source> profile ?.
+If it is a system profile it will be recreated next time.</source>
+ <translation>設定檔 ?.
+ 如果它是一個系統設定檔，它將在下一次建立。</translation>
 </message>
 </context>
 <context>
 <name>x265ConfigDialog</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
- <source>x265 Configuraton</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+2123"/>
+ <location line="+168"/>
+ <location line="+302"/>
+ <source>%</source>
+ <translation>%</translation>
 </message>
 <message>
- <location line="+24"/>
- <source>Configuration:</source>
- <translation type="unfinished">設定:</translation>
+ <location line="-1701"/>
+ <source>0</source>
+ <translation>0</translation>
 </message>
 <message>
- <location line="+17"/>
- <source>Save As</source>
- <translation type="unfinished">另存新檔</translation>
+ <location line="-663"/>
+ <location line="+668"/>
+ <source>1</source>
+ <translation>1</translation>
 </message>
 <message>
- <location line="+7"/>
- <location line="+2731"/>
- <source>Delete</source>
- <translation type="unfinished">刪除</translation>
+ <location line="-648"/>
+ <source>2</source>
+ <translation>2</translation>
 </message>
 <message>
- <location line="-2689"/>
- <source>General</source>
- <translation type="unfinished"></translation>
+ <location line="+15"/>
+ <location line="+638"/>
+ <source>3</source>
+ <translation>3</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Basic</source>
- <translation type="unfinished"></translation>
+ <location line="-623"/>
+ <source>4</source>
+ <translation>4</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Use advanced configuration</source>
- <translation type="unfinished"></translation>
+ <location line="+15"/>
+ <source>5</source>
+ <translation>5</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Profile:</source>
- <translation type="unfinished"></translation>
+ <location line="+613"/>
+ <source>7</source>
+ <translation>7</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Preset:</source>
- <translation type="unfinished"></translation>
+ <location line="+2156"/>
+ <source>:</source>
+ <translation>:</translation>
 </message>
 <message>
- <location line="+51"/>
- <source>Tuning:</source>
- <translation type="unfinished"></translation>
+ <location line="-2151"/>
+ <source>15</source>
+ <translation>15</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>IDC Level:</source>
- <translation type="unfinished"></translation>
+ <location line="+5"/>
+ <source>31</source>
+ <translation>31</translation>
 </message>
 <message>
- <location line="+33"/>
- <source>Auto</source>
- <translation type="unfinished">自動</translation>
+ <location line="+1247"/>
+ <source>Cb</source>
+ <translation>Cb</translation>
 </message>
 <message>
- <location line="+5"/>
- <location line="+668"/>
- <source>1</source>
- <translation type="unfinished">1</translation>
+ <location line="+23"/>
+ <source>Cr</source>
+ <translation>Cr</translation>
 </message>
 <message>
- <location line="-663"/>
+ <location line="-1724"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="-229"/>
 <source>1.1</source>
- <translation type="unfinished">1.1</translation>
+ <translation>1.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>1.2</source>
- <translation type="unfinished">1.2</translation>
+ <translation>1.2</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>1.3</source>
- <translation type="unfinished">1.3</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>2</source>
- <translation type="unfinished">2</translation>
+ <translation>1.3</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+10"/>
 <source>2.1</source>
- <translation type="unfinished">2.1</translation>
+ <translation>2.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>2.2</source>
- <translation type="unfinished">2.2</translation>
- </message>
- <message>
- <location line="+5"/>
- <location line="+638"/>
- <source>3</source>
- <translation type="unfinished">3</translation>
+ <translation>2.2</translation>
 </message>
 <message>
- <location line="-633"/>
+ <location line="+10"/>
 <source>3.1</source>
- <translation type="unfinished">3.1</translation>
+ <translation>3.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>3.2</source>
- <translation type="unfinished">3.2</translation>
+ <translation>3.2</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>4</source>
- <translation type="unfinished">4</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+10"/>
 <source>4.1</source>
- <translation type="unfinished">4.1</translation>
+ <translation>4.1</translation>
 </message>
 <message>
 <location line="+5"/>
 <source>4.2</source>
- <translation type="unfinished">4.2</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>5</source>
- <translation type="unfinished">5</translation>
+ <translation>4.2</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+10"/>
 <source>5.1</source>
- <translation type="unfinished">5.1</translation>
+ <translation>5.1</translation>
 </message>
 <message>
- <location line="+27"/>
- <source>Pool Threads </source>
+ <location line="+927"/>
+ <source>Constrained Intra Prediction</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Frame Threads </source>
+ <location line="+618"/>
+ <source>Noise Reduction:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+28"/>
- <source>Rate Control</source>
- <translation type="unfinished">比率控制</translation>
+ <location line="+85"/>
+ <source>Strong Intra Smoothing</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+21"/>
- <source>Target Video Size:</source>
+ <location line="+933"/>
+ <source>Custom:</source>
+ <comment>multithreading</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Constant Bitrate (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="+674"/>
+ <source>CBR</source>
+ <translation>CBR</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Constant Quantiser (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="-749"/>
+ <source>Add</source>
+ <translation>加入</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Constant Rate Factor (Single Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="+681"/>
+ <source>FCC</source>
+ <translation>FCC</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Video Size (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="+20"/>
+ <source>GBR</source>
+ <translation>GBR</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Average Bitrate (Two Pass)</source>
- <translation type="unfinished"></translation>
+ <location line="-199"/>
+ <source>MAC</source>
+ <translation>MAC</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Encoding Mode:</source>
- <translation type="unfinished"></translation>
+ <location line="-15"/>
+ <source>PAL</source>
+ <translation>PAL逐行倒相</translation>
 </message>
 <message>
- <location line="+22"/>
- <source>MB</source>
- <translation type="unfinished">MB</translation>
+ <location line="+257"/>
+ <source>VBR</source>
+ <translation>可變位元率(VBR)</translation>
 </message>
 <message>
- <location line="+44"/>
- <location line="+213"/>
- <source>0 (High Quality)</source>
- <translation type="unfinished"></translation>
+ <location line="-3307"/>
+ <source>Auto</source>
+ <translation>自動</translation>
 </message>
 <message>
- <location line="-190"/>
- <location line="+213"/>
- <location line="+1267"/>
- <source>Quantiser</source>
- <translation type="unfinished"></translation>
+ <location line="+3004"/>
+ <source>Crop</source>
+ <translation>裁剪</translation>
 </message>
 <message>
- <location line="-1457"/>
- <location line="+213"/>
- <source>51 (Low Quality)</source>
- <translation type="unfinished"></translation>
+ <location line="-1252"/>
+ <location line="+818"/>
+ <source>Edit</source>
+ <translation>編輯</translation>
 </message>
 <message>
- <location line="-143"/>
- <source>Use Strict Constant Bitrate Mode</source>
- <translation type="unfinished"></translation>
+ <location line="-1291"/>
+ <source>Fast</source>
+ <translation>快</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>Advanced RC</source>
- <translation type="unfinished"></translation>
+ <location line="+1849"/>
+ <source>Film</source>
+ <translation>電影</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Advanced Rate Control</source>
- <translation type="unfinished"></translation>
+ <location line="-73"/>
+ <source>NTSC</source>
+ <translation>NTSC國家電視系統委員會</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Maximum Constant Rate Factor</source>
- <translation type="unfinished"></translation>
+ <location line="+247"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <location line="+158"/>
- <source>Coding Unit-tree Rate Control</source>
- <translation type="unfinished"></translation>
+ <location line="-303"/>
+ <source>Show</source>
+ <translation>慢</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Frametype Lookahead:</source>
- <translation type="unfinished"></translation>
+ <location line="-664"/>
+ <source>kbit</source>
+ <translation>kbit</translation>
 </message>
 <message>
- <location line="+14"/>
- <location line="+2070"/>
- <source>frames</source>
- <translation type="unfinished"></translation>
+ <location line="+768"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT709</source>
+ <translation>BT709</translation>
 </message>
 <message>
- <location line="-2046"/>
- <source>Sequence Parameter Set Identifer:</source>
- <translation type="unfinished"></translation>
+ <location line="-3352"/>
+ <source>Basic</source>
+ <translation>基本</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>0</source>
- <translation type="unfinished">0</translation>
+ <location line="+1186"/>
+ <source>Frame</source>
+ <translation>幀</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>7</source>
- <translation type="unfinished">7</translation>
+ <location line="+326"/>
+ <source>Minimum:</source>
+ <translation>最小 :</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>15</source>
- <translation type="unfinished">15</translation>
+ <location line="+1661"/>
+ <source>SECAM</source>
+ <translation>SECAM順序彩色與記憶</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>31</source>
- <translation type="unfinished">31</translation>
+ <location line="+209"/>
+ <source>YCgCo</source>
+ <translation>YCgCo</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>Motion</source>
- <translation type="unfinished">動作</translation>
+ <location line="-726"/>
+ <source>Zones</source>
+ <translation>緩衝區</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Motion Estimation</source>
- <translation type="unfinished">動作估測</translation>
+ <location line="-58"/>
+ <source>Maximum Macroblocks per Slice:</source>
+ <translation>切割每幀最大宏塊</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Motion Estimation Method:</source>
- <translation type="unfinished"></translation>
+ <location line="-22"/>
+ <source>bytes</source>
+ <translation>位元</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Diamond Search</source>
- <translation type="unfinished">菱形搜尋</translation>
+ <location line="-1852"/>
+ <source>Coding Unit-tree Rate Control</source>
+ <translation>單位碼-樹速率控制</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Hexagonal Search</source>
- <translation type="unfinished">六角形搜尋</translation>
+ <location line="+410"/>
+ <location line="+217"/>
+ <location line="+36"/>
+ <source>Disabled</source>
+ <translation>停用</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Uneven Multi-hexagonal Search</source>
- <translation type="unfinished"></translation>
+ <location line="+1682"/>
+ <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
+ <translation>這些設定只是建議播放設備，使用您自擔風險。</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Star Search</source>
- <translation type="unfinished"></translation>
+ <location line="-534"/>
+ <source>VBV Buffer Size:</source>
+ <translation>VBV 緩衝容量 :</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Exhaustive Search</source>
- <translation type="unfinished">徹底搜尋</translation>
+ <location line="-1411"/>
+ <source>Weighted Prediction for P-frames:</source>
+ <translation>P-幀的加權預測</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>1 (Fast)</source>
- <translation type="unfinished"></translation>
+ <location line="+910"/>
+ <source>Maximum Quantiser Step:</source>
+ <translation>最大量化步驟:</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Subpixel Refinement</source>
- <translation type="unfinished"></translation>
+ <location line="+526"/>
+ <source>Maximum Size per Slice:</source>
+ <translation>切割每幀最大容量</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>7 (Best)</source>
- <translation type="unfinished"></translation>
+ <location line="-264"/>
+ <source>Variance AQ:</source>
+ <translation>可變 AQ:</translation>
 </message>
 <message>
- <location line="+78"/>
- <source>Motion Vector</source>
- <translation type="unfinished"></translation>
+ <location line="-1736"/>
+ <source>Advanced Rate Control</source>
+ <translation>進階速率控制(RC)</translation>
 </message>
 <message>
- <location line="+35"/>
- <source>Maximum Motion Vector Search Range:</source>
- <translation type="unfinished"></translation>
+ <location line="+2580"/>
+ <source>Video Format:</source>
+ <translation>影片格式:</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Prediction</source>
- <translation type="unfinished"></translation>
+ <location line="-2085"/>
+ <source>Motion Vector</source>
+ <translation>向量運動</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Weighted Prediction for B-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-763"/>
+ <source>Constant Quantiser (Single Pass)</source>
+ <translation>恆定量化器(QP)(1通)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Constrained Intra Prediction</source>
- <translation type="unfinished"></translation>
+ <location line="+1662"/>
+ <source>I and P-frame Quantiser Ratio:</source>
+ <translation>P:I , P-幀量化率:</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Weighted Prediction for P-frames:</source>
- <translation type="unfinished"></translation>
+ <location line="+834"/>
+ <source>Enforce Repeatability</source>
+ <translation>強制重播</translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+217"/>
- <location line="+36"/>
- <source>Disabled</source>
- <translation type="unfinished">停用</translation>
+ <location line="-690"/>
+ <source>P and B-frame Quantiser Ratio:</source>
+ <translation>B:P , B-幀量化率:</translation>
 </message>
 <message>
- <location line="-248"/>
- <source>Weighted References</source>
- <translation type="unfinished"></translation>
+ <location line="-595"/>
+ <source>GOP Size:</source>
+ <translation>GOP(圖像群組) 大小:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Weighted References + Duplicates</source>
- <translation type="unfinished"></translation>
+ <location line="-32"/>
+ <source>B-frame Bias:</source>
+ <translation>B-幀偏移：</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>Frame</source>
- <translation type="unfinished"></translation>
+ <location line="-591"/>
+ <source>Hexagonal Search</source>
+ <translation>六角形搜尋</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Frame Encoding</source>
- <translation type="unfinished"></translation>
+ <location line="-368"/>
+ <source>Use Strict Constant Bitrate Mode</source>
+ <translation>使用嚴格固定位元率模式(CBR)</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Loop Filter:</source>
- <translation type="unfinished"></translation>
+ <location line="-238"/>
+ <source>Target Video Size:</source>
+ <translation>目標影片大小</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Open GOP:</source>
- <translation type="unfinished"></translation>
+ <location line="+703"/>
+ <source>7 (Best)</source>
+ <translation>7 (最好)</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Normal Mode</source>
- <translation type="unfinished"></translation>
+ <location line="-40"/>
+ <source>1 (Fast)</source>
+ <translation>1 (快)</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Blu-ray Mode</source>
- <translation type="unfinished"></translation>
+ <location line="+424"/>
+ <source>Non-strict (Not Blu-ray Compatible)</source>
+ <translation>非嚴格（不與Blu-ray藍光相容）</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Interlaced:</source>
- <translation type="unfinished"></translation>
+ <location line="+551"/>
+ <source>Quantiser Control</source>
+ <translation>量化控制</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Top Field First</source>
- <translation type="unfinished"></translation>
+ <location line="-1605"/>
+ <source>Average Bitrate (Two Pass)</source>
+ <translation>平均位元率(ABR)(2通)</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Bottom Field First</source>
- <translation type="unfinished"></translation>
+ <location line="+1846"/>
+ <source>Quantiser Curve Compression</source>
+ <translation>量化曲線壓縮(QCComp)</translation>
 </message>
 <message>
- <location line="+30"/>
- <source>Maximum Reference Frames:</source>
- <translation type="unfinished"></translation>
+ <location line="-658"/>
+ <source>I-frames</source>
+ <translation>I-幀(內幀,前幀)</translation>
 </message>
 <message>
- <location line="+39"/>
+ <location line="-160"/>
 <source>B-frames</source>
- <translation type="unfinished"></translation>
+ <translation>B-幀 (介於前I幀與後P幀間連續預測幀，例如: IBBBPBBBPBBBPBBBIBBBP....)</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>B-frames as References:</source>
- <translation type="unfinished"></translation>
+ <location line="+1404"/>
+ <source>Auto-detect</source>
+ <translation>自動偵測</translation>
 </message>
 <message>
- <location line="+15"/>
- <source>Strictly Hierarchical Pyramid</source>
- <translation type="unfinished"></translation>
+ <location line="-1254"/>
+ <source>Adaptive B-frame Decision:</source>
+ <translation>自適應 B 幀的決定：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Non-strict (Not Blu-ray Compatible)</source>
- <translation type="unfinished"></translation>
+ <location line="-224"/>
+ <source>Top Field First</source>
+ <translation>頂部首先掃描</translation>
 </message>
 <message>
- <location line="+31"/>
- <source>Fast</source>
- <translation type="unfinished">快</translation>
+ <location line="+383"/>
+ <source>Trellis Quantization:</source>
+ <translation>網格量化:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Optimal</source>
- <translation type="unfinished">最理想化</translation>
+ <location line="+562"/>
+ <source>Reduce Fluctuation Before Curve Compression:</source>
+ <translation>減少波動曲線壓縮之前：</translation>
 </message>
 <message>
- <location line="+74"/>
- <source>B-frame Bias:</source>
- <translation type="unfinished"></translation>
+ <location line="+952"/>
+ <source>Component</source>
+ <translation>合成的</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Maximum Consecutive B-frames:</source>
- <translation type="unfinished"></translation>
+ <location line="+63"/>
+ <location line="+63"/>
+ <source>BT470M</source>
+ <translation>BT470M</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Adaptive B-frame Decision:</source>
- <translation type="unfinished"></translation>
+ <location line="-1654"/>
+ <location line="+6"/>
+ <source>Analysis</source>
+ <translation>分析</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>I-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-1070"/>
+ <source>Maximum Constant Rate Factor</source>
+ <translation>最大恆定速率係數(CRF)</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>GOP Size:</source>
- <translation type="unfinished"></translation>
+ <location line="+2158"/>
+ <source>Multithreading</source>
+ <translation>多線程</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Minimum:</source>
- <translation type="unfinished"></translation>
+ <location line="-2772"/>
+ <location line="+2738"/>
+ <source>Delete</source>
+ <translation>刪除</translation>
 </message>
 <message>
- <location line="+33"/>
- <source>Maximum:</source>
- <translation type="unfinished"></translation>
+ <location line="+297"/>
+ <source>Predefined Aspect Ratio:</source>
+ <translation>預定義PAR:</translation>
 </message>
 <message>
- <location line="+32"/>
- <source>I-frame Threshold:</source>
- <translation type="unfinished"></translation>
+ <location line="-2102"/>
+ <source>Uneven Multi-hexagonal Search</source>
+ <translation>六邊形搜索</translation>
 </message>
 <message>
- <location line="+53"/>
- <location line="+6"/>
- <source>Analysis</source>
- <translation type="unfinished"></translation>
+ <location line="-331"/>
+ <source>Advanced RC</source>
+ <translation>進階速率控制(RC)</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Trellis Quantization:</source>
- <translation type="unfinished"></translation>
+ <location line="+590"/>
+ <source>Weighted References + Duplicates</source>
+ <translation>加權參考 + 重複項</translation>
 </message>
 <message>
- <location line="+11"/>
- <source>Final Macroblock Only</source>
- <translation type="unfinished"></translation>
+ <location line="+2155"/>
+ <source>LOG100</source>
+ <translation>LOG100</translation>
 </message>
 <message>
 <location line="+5"/>
- <source>Always On</source>
- <translation type="unfinished"></translation>
+ <source>LOG316</source>
+ <translation>LOG316</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Fast Skip Detection on P-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-1384"/>
+ <source>Chroma to Luma Quantiser Offset:</source>
+ <translation>從色度明度量化偏移量:&lt;</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>DCT Decimation on P-frames</source>
- <translation type="unfinished"></translation>
+ <location line="-1840"/>
+ <source>IDC Level:</source>
+ <translation>IDC等級 :</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Psychovisual Rate Distortion Optimisation:</source>
- <translation type="unfinished"></translation>
+ <location line="+3214"/>
+ <source>Linear</source>
+ <translation>線性</translation>
 </message>
 <message>
- <location line="+34"/>
- <source>Noise Reduction:</source>
- <translation type="unfinished"></translation>
+ <location line="-1448"/>
+ <source>JVT Matrix</source>
+ <translation>JVT 矩陣</translation>
 </message>
 <message>
- <location line="+37"/>
- <source>Noise Reduction Intra:</source>
- <translation type="unfinished"></translation>
+ <location line="-998"/>
+ <source>Motion</source>
+ <translation>運動</translation>
 </message>
 <message>
- <location line="+14"/>
- <source>Noise Reduction Inter:</source>
- <translation type="unfinished"></translation>
+ <location line="+2055"/>
+ <source>As Input</source>
+ <translation>另輸出為其他輸入檔(保留原始影片的PAR)</translation>
 </message>
 <message>
- <location line="+37"/>
- <source>Quantisation Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="-28"/>
+ <source>Generate Access Unit Delimiters</source>
+ <translation>生成存取單元分隔符號</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Flat Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="-566"/>
+ <source>Normal</source>
+ <translation>一般</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>JVT Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="+560"/>
+ <source>Output</source>
+ <translation>輸出</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Custom Matrix</source>
- <translation type="unfinished"></translation>
+ <location line="-1033"/>
+ <source>Flat Matrix</source>
+ <translation>平面矩陣</translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+818"/>
- <source>Edit</source>
- <translation type="unfinished"></translation>
+ <location line="+1400"/>
+ <location line="+78"/>
+ <location line="+58"/>
+ <source>SMPTE240M</source>
+ <translation>SMPTE240M</translation>
 </message>
 <message>
- <location line="-771"/>
- <source>Quantiser Control</source>
- <translation type="unfinished"></translation>
+ <location line="-141"/>
+ <location line="+136"/>
+ <source>SMPTE170M</source>
+ <translation>SMPTE170M</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Chroma to Luma Quantiser Offset:</source>
- <translation type="unfinished"></translation>
+ <location line="+38"/>
+ <source>HRD Parameters:</source>
+ <translation>HRD 參數：</translation>
 </message>
 <message>
- <location line="+34"/>
- <source>I and P-frame Quantiser Ratio:</source>
- <translation type="unfinished"></translation>
+ <location line="-3009"/>
+ <location line="+213"/>
+ <source>0 (High Quality)</source>
+ <translation>0 (高品質)</translation>
 </message>
 <message>
- <location line="+58"/>
- <location line="+168"/>
- <location line="+302"/>
- <source>%</source>
- <translation type="unfinished"></translation>
+ <location line="+732"/>
+ <source>B-frames as References:</source>
+ <translation>B幀作為參考</translation>
 </message>
 <message>
- <location line="-448"/>
- <source>Maximum Quantiser Step:</source>
- <translation type="unfinished"></translation>
+ <location line="+1996"/>
+ <source>Colour Matrix:</source>
+ <translation>顏色矩陣：</translation>
 </message>
 <message>
- <location line="+19"/>
- <source>Cb</source>
- <translation type="unfinished"></translation>
+ <location line="-3050"/>
+ <source>Constant Bitrate (Single Pass)</source>
+ <translation>固定位元率(CBR)(1通)</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Cr</source>
- <translation type="unfinished"></translation>
+ <location line="+603"/>
+ <source>Star Search</source>
+ <translation>開始搜尋</translation>
 </message>
 <message>
- <location line="+22"/>
- <source>P and B-frame Quantiser Ratio:</source>
- <translation type="unfinished"></translation>
+ <location line="+2591"/>
+ <source>Full Range Samples</source>
+ <translation>全範圍色度樣品</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Average Bitrate Tolerance:</source>
- <translation type="unfinished"></translation>
+ <location line="-1653"/>
+ <source>Quantisation Matrix</source>
+ <translation>量化矩陣</translation>
 </message>
 <message>
- <location line="+48"/>
- <source>Quantiser Curve Compression</source>
- <translation type="unfinished"></translation>
+ <location line="-58"/>
+ <source>Noise Reduction Intra:</source>
+ <translation>在內部減少雜訊：</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Quantiser Curve Compression:</source>
- <translation type="unfinished"></translation>
+ <location line="+14"/>
+ <source>Noise Reduction Inter:</source>
+ <translation>在之間減少雜訊：</translation>
 </message>
 <message>
- <location line="+45"/>
- <source>Reduce Fluctuation Before Curve Compression:</source>
- <translation type="unfinished"></translation>
+ <location line="-1342"/>
+ <location line="+213"/>
+ <source>51 (Low Quality)</source>
+ <translation>51 (低品質)</translation>
 </message>
 <message>
- <location line="+70"/>
- <source>Reduce Fluctuation After Curve Compression:</source>
- <translation type="unfinished"></translation>
+ <location line="+742"/>
+ <source>Optimal</source>
+ <translation>優化</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Adaptive Quantisation</source>
- <translation type="unfinished">適性量化</translation>
+ <location line="-650"/>
+ <location line="+2077"/>
+ <source>frames</source>
+ <translation>幀</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Variance AQ:</source>
- <translation type="unfinished"></translation>
+ <location line="-1169"/>
+ <source>Final Macroblock Only</source>
+ <translation>最終的宏塊(更快，中等品質)</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>Normal</source>
- <translation type="unfinished">一般</translation>
+ <location line="-1430"/>
+ <source>Frame Threads </source>
+ <translation>幀線程</translation>
 </message>
 <message>
- <location line="+5"/>
+ <location line="+883"/>
+ <source>Weighted Prediction for B-frames</source>
+ <translation>B-幀的加權預測</translation>
+ </message>
+ <message>
+ <location line="+1206"/>
 <source>Auto Variance AQ</source>
- <translation type="unfinished"></translation>
+ <translation>自動變量 AQ:</translation>
 </message>
 <message>
- <location line="+26"/>
- <source>Strength:</source>
- <translation type="unfinished"></translation>
+ <location line="+199"/>
+ <source>kbit/s</source>
+ <translation>kbit/s</translation>
 </message>
 <message>
- <location line="+65"/>
- <source>Advanced 1</source>
- <translation type="unfinished"></translation>
+ <location line="-81"/>
+ <source>Initial VBV Buffer Occupancy:</source>
+ <translation>初始 VBV 緩衝區佔用：</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Video Buffer Verifier</source>
- <translation type="unfinished">視訊緩衝校對器</translation>
+ <location line="+794"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>BT470BG</source>
+ <translation>BT470BG</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Maximum VBV Bitrate:</source>
- <translation type="unfinished"></translation>
+ <location line="-3340"/>
+ <source>Preset:</source>
+ <translation>預設定:</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Initial VBV Buffer Occupancy:</source>
- <translation type="unfinished"></translation>
+ <location line="+2863"/>
+ <source>Pixel Aspect Ratio</source>
+ <translation>像素寬高比(PAR)-(不同於外觀比的顯示寬高比(DAR))</translation>
 </message>
 <message>
- <location line="+16"/>
- <source>kbit</source>
- <translation type="unfinished"></translation>
+ <location line="-1202"/>
+ <source>Fast Skip Detection on P-frames</source>
+ <translation>快速跳過檢測 P-幀 (場景中如有虛影時按取消)</translation>
 </message>
 <message>
- <location line="+65"/>
- <source>kbit/s</source>
- <translation type="unfinished"></translation>
+ <location line="-463"/>
+ <source>Normal Mode</source>
+ <translation>正常模式</translation>
 </message>
 <message>
- <location line="+22"/>
- <source>VBV Buffer Size:</source>
- <translation type="unfinished"></translation>
+ <location line="+1185"/>
+ <source>Advanced 1</source>
+ <translation>進階 : 1</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Slicing</source>
- <translation type="unfinished"></translation>
+ <location line="+313"/>
+ <source>Advanced 2</source>
+ <translation>進階 2</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Slices per Frame:</source>
- <translation type="unfinished"></translation>
+ <location line="-2299"/>
+ <location line="+213"/>
+ <location line="+1274"/>
+ <source>Quantiser</source>
+ <translation>量化器</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Maximum Size per Slice:</source>
- <translation type="unfinished"></translation>
+ <location line="+1403"/>
+ <source>SMPTEL170M</source>
+ <translation>SMPTEL170M</translation>
 </message>
 <message>
- <location line="+16"/>
- <source>bytes</source>
- <translation type="unfinished"></translation>
+ <location line="-309"/>
+ <source>16:15 (PAL 4:3)</source>
+ <translation>16:15 (PAL 4:3)</translation>
 </message>
 <message>
- <location line="+22"/>
- <source>Maximum Macroblocks per Slice:</source>
- <translation type="unfinished"></translation>
+ <location line="-2229"/>
+ <source>Sequence Parameter Set Identifer:</source>
+ <translation>序列參數集的識別碼：</translation>
 </message>
 <message>
- <location line="+58"/>
- <source>Zones</source>
- <translation type="unfinished"></translation>
+ <location line="+1569"/>
+ <source>Strength:</source>
+ <translation>強度 :</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>Add</source>
- <translation type="unfinished">加入</translation>
+ <location line="+213"/>
+ <source>Slices per Frame:</source>
+ <translation>切割每幀:</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>Advanced 2</source>
- <translation type="unfinished"></translation>
+ <location line="-2338"/>
+ <source>Pool Threads </source>
+ <translation>共用線程</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Multithreading</source>
- <translation type="unfinished"></translation>
+ <location line="+1330"/>
+ <source>Maximum:</source>
+ <translation>最大 :</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Disable</source>
- <translation type="unfinished"></translation>
+ <location line="+616"/>
+ <source>Quantiser Curve Compression:</source>
+ <translation>量化曲線壓縮(QCComp)</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Auto-detect</source>
- <translation type="unfinished">自動偵測</translation>
+ <location line="+844"/>
+ <source>64:45 (PAL 16:9)</source>
+ <translation>64:45 (PAL 16:9)</translation>
 </message>
 <message>
- <location line="+12"/>
- <source>Custom:</source>
- <comment>multithreading</comment>
- <translation type="unfinished"></translation>
+ <location line="-2990"/>
+ <source>Profile:</source>
+ <translation>設定檔</translation>
 </message>
 <message>
- <location line="+37"/>
- <source>Enforce Repeatability</source>
- <translation type="unfinished"></translation>
+ <location line="+1233"/>
+ <source>Interlaced:</source>
+ <translation>純交錯模式:</translation>
 </message>
 <message>
- <location line="+7"/>
- <source>Slice-based Threading</source>
- <translation type="unfinished"></translation>
+ <location line="-353"/>
+ <source>Exhaustive Search</source>
+ <translation>Hadamard徹底搜尋（TESA）</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Custom Threaded Lookahead Buffer:</source>
- <translation type="unfinished"></translation>
+ <location line="-950"/>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
 </message>
 <message>
- <location line="+59"/>
- <source>Output 1</source>
- <translation type="unfinished"></translation>
+ <location line="+1145"/>
+ <source>Maximum Motion Vector Search Range:</source>
+ <translation>最大向量運動搜尋範圍:</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Output</source>
- <translation type="unfinished">輸出</translation>
+ <location line="+108"/>
+ <source>Loop Filter:</source>
+ <translation>循環或迴圈濾鏡器：</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Generate Access Unit Delimiters</source>
- <translation type="unfinished"></translation>
+ <location line="+98"/>
+ <source>Maximum Reference Frames:</source>
+ <translation>最大參考幀數</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Pixel Aspect Ratio</source>
- <translation type="unfinished">像素外觀比例</translation>
+ <location line="-421"/>
+ <source>Diamond Search</source>
+ <translation>菱形搜尋</translation>
 </message>
 <message>
- <location line="+8"/>
- <source>Custom:</source>
- <comment>PAR</comment>
- <translation type="unfinished"></translation>
+ <location line="+1672"/>
+ <source>Slicing</source>
+ <translation>切割</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>As Input</source>
- <translation type="unfinished">另輸出為</translation>
+ <location line="-2643"/>
+ <source>x265 Configuraton</source>
+ <translation>x265 配置</translation>
 </message>
 <message>
- <location line="+49"/>
- <source>:</source>
- <translation type="unfinished"></translation>
+ <location line="+1235"/>
+ <source>Weighted References</source>
+ <translation>加權參考</translation>
 </message>
 <message>
- <location line="+35"/>
- <source>Predefined Aspect Ratio:</source>
- <translation type="unfinished"></translation>
+ <location line="-285"/>
+ <source>Motion Estimation</source>
+ <translation>運動估計</translation>
 </message>
 <message>
- <location line="+13"/>
- <source>16:15 (PAL 4:3)</source>
- <translation type="unfinished"></translation>
+ <location line="+1563"/>
+ <source>Video Buffer Verifier</source>
+ <translation>影片緩衝驗證器(VBV)</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>64:45 (PAL 16:9)</source>
- <translation type="unfinished"></translation>
+ <location line="+690"/>
+ <location line="+46"/>
+ <location line="+58"/>
+ <location line="+63"/>
+ <location line="+73"/>
+ <source>Undefined</source>
+ <translation>未定義</translation>
 </message>
 <message>
- <location line="+5"/>
+ <source>Custom:</source>
+ <translation type="vanished">自訂:</translation>
+ </message>
+ <message>
+ <location line="-337"/>
 <source>8:9 (NTSC 4:3)</source>
- <translation type="unfinished"></translation>
+ <translation>8:9 (NTSC 4:3)</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>32:27 (NTSC 16:9)</source>
- <translation type="unfinished"></translation>
+ <location line="-1908"/>
+ <source>Prediction</source>
+ <translation>預測</translation>
 </message>
 <message>
- <location line="+42"/>
- <source>Output 2</source>
- <translation type="unfinished"></translation>
+ <location line="+1630"/>
+ <source>Disable</source>
+ <translation>停用</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>Video Usability Information</source>
- <translation type="unfinished"></translation>
+ <location line="-1155"/>
+ <source>I-frame Threshold:</source>
+ <translation>I-幀線程:</translation>
 </message>
 <message>
- <location line="+6"/>
- <source>These settings are only suggestions for the playback equipment. Use at your own risk.</source>
- <translation type="unfinished"></translation>
+ <location line="+1316"/>
+ <source>Custom:</source>
+ <comment>PAR</comment>
+ <translatorcomment>PAR</translatorcomment>
+ <translation>自訂:</translation>
 </message>
 <message>
- <location line="+28"/>
- <source>Overscan:</source>
- <translation type="unfinished"></translation>
+ <location line="-1203"/>
+ <source>DCT Decimation on P-frames</source>
+ <translation>DCT 抽取對P幀</translation>
 </message>
 <message>
- <location line="+10"/>
- <location line="+46"/>
- <location line="+58"/>
- <location line="+63"/>
- <location line="+73"/>
- <source>Undefined</source>
- <translation type="unfinished"></translation>
+ <location line="-1617"/>
+ <source>Tuning:</source>
+ <translation>調音:</translation>
 </message>
 <message>
- <location line="-235"/>
- <source>Show</source>
- <translation type="unfinished"></translation>
+ <location line="+789"/>
+ <source>Motion Estimation Method:</source>
+ <translation>運動估計方法:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>Crop</source>
- <translation type="unfinished">剪裁</translation>
+ <location line="-560"/>
+ <source>Video Size (Two Pass)</source>
+ <translation>影片大小(2通)</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Video Format:</source>
- <translation type="unfinished"></translation>
+ <location line="-296"/>
+ <source>Use advanced configuration</source>
+ <translation>使用進階配置</translation>
 </message>
 <message>
- <location line="+18"/>
- <source>Component</source>
- <translation type="unfinished"></translation>
+ <location line="+1201"/>
+ <source>Open GOP:</source>
+ <translation>開啟 GOP(圖像群組):</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>PAL</source>
- <translation type="unfinished"></translation>
+ <location line="-15"/>
+ <source>Frame Encoding</source>
+ <translation>幀編碼</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>NTSC</source>
- <translation type="unfinished"></translation>
+ <location line="+33"/>
+ <source>Blu-ray Mode</source>
+ <translation>Blu-ray 模式</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>SECAM</source>
- <translation type="unfinished"></translation>
+ <location line="+1790"/>
+ <source>32:27 (NTSC 16:9)</source>
+ <translation>2:27 (NTSC 16:9)</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>MAC</source>
- <translation type="unfinished"></translation>
+ <location line="-1537"/>
+ <source>Maximum Consecutive B-frames:</source>
+ <translation>最大連續 B-幀：</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Colour Primaries:</source>
- <translation type="unfinished"></translation>
+ <location line="+1619"/>
+ <source>Overscan:</source>
+ <translation>過度掃描</translation>
 </message>
 <message>
- <location line="+15"/>
- <location line="+63"/>
- <location line="+73"/>
- <source>BT709</source>
- <translation type="unfinished"></translation>
+ <location line="-234"/>
+ <source>Output 1</source>
+ <translation>輸出 1</translation>
 </message>
 <message>
- <location line="-131"/>
- <location line="+63"/>
- <source>BT470M</source>
- <translation type="unfinished"></translation>
+ <location line="+194"/>
+ <source>Output 2</source>
+ <translation>輸出 2</translation>
 </message>
 <message>
- <location line="-58"/>
- <location line="+63"/>
- <location line="+73"/>
- <source>BT470BG</source>
- <translation type="unfinished"></translation>
+ <location line="-769"/>
+ <source>Adaptive Quantisation</source>
+ <translation>自適應量化(AQ)</translation>
 </message>
 <message>
- <location line="-131"/>
- <location line="+136"/>
- <source>SMPTE170M</source>
- <translation type="unfinished"></translation>
+ <location line="-628"/>
+ <source>Always On</source>
+ <translation>始終在(緩慢，品質最好)</translation>
 </message>
 <message>
- <location line="-131"/>
- <location line="+78"/>
- <location line="+58"/>
- <source>SMPTE240M</source>
- <translation type="unfinished"></translation>
+ <location line="-394"/>
+ <source>Bottom Field First</source>
+ <translation>底部首先掃描</translation>
 </message>
 <message>
- <location line="-131"/>
- <source>Film</source>
- <translation type="unfinished"></translation>
+ <location line="-1272"/>
+ <source>General</source>
+ <translation>一般</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>Transfer Characteristics:</source>
- <translation type="unfinished"></translation>
+ <location line="+2810"/>
+ <source>Custom Threaded Lookahead Buffer:</source>
+ <translation>自訂線程預測先行緩衝區：</translation>
 </message>
 <message>
- <location line="+30"/>
- <source>Linear</source>
- <translation type="unfinished"></translation>
+ <location line="-2551"/>
+ <source>Rate Control</source>
+ <translation>速率控制</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>LOG100</source>
- <translation type="unfinished"></translation>
+ <location line="+2172"/>
+ <source>Maximum VBV Bitrate:</source>
+ <translation>最大 VBV 位元率 :</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>LOG316</source>
- <translation type="unfinished"></translation>
+ <location line="-2095"/>
+ <source>Encoding Mode:</source>
+ <translation>編碼模式:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>SMPTEL170M</source>
- <translation type="unfinished"></translation>
+ <location line="+1026"/>
+ <source>Strictly Hierarchical Pyramid</source>
+ <translation>金字塔嚴格的等級制度</translation>
 </message>
 <message>
- <location line="+28"/>
- <source>Colour Matrix:</source>
- <translation type="unfinished"></translation>
+ <location line="+1439"/>
+ <source>Slice-based Threading</source>
+ <translation>切割基本線程</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>FCC</source>
- <translation type="unfinished"></translation>
+ <location line="-690"/>
+ <source>Average Bitrate Tolerance:</source>
+ <translation>平均位元率誤差(ABR)</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>GBR</source>
- <translation type="unfinished"></translation>
+ <location line="-2177"/>
+ <source>Configuration:</source>
+ <translation>配置:</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>YCgCo</source>
- <translation type="unfinished"></translation>
+ <location line="+1029"/>
+ <source>Subpixel Refinement</source>
+ <translation>次像素精細化(次ME)</translation>
 </message>
 <message>
- <location line="+23"/>
- <source>HRD Parameters:</source>
- <translation type="unfinished"></translation>
+ <location line="+2307"/>
+ <source>Transfer Characteristics:</source>
+ <translation>轉移特性：</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
+ <location line="-1565"/>
+ <source>Psychovisual Rate Distortion Optimisation:</source>
+ <translation>心理視覺優化(Psy RDO)：</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>VBR</source>
- <translation type="unfinished">VBR</translation>
+ <location line="+1364"/>
+ <source>Video Usability Information</source>
+ <translation>影片可用性資訊</translation>
 </message>
 <message>
- <location line="+5"/>
- <source>CBR</source>
- <translation type="unfinished">CBR</translation>
+ <location line="-2766"/>
+ <source>Constant Rate Factor (Single Pass)</source>
+ <translation>恆定速率係數(CRF)(1通)</translation>
 </message>
 <message>
- <location line="+23"/>
+ <location line="+436"/>
+ <source>Frametype Lookahead:</source>
+ <translation>幀類型預測先行:</translation>
+ </message>
+ <message>
+ <location line="+2468"/>
+ <source>Colour Primaries:</source>
+ <translation>基色 :</translation>
+ </message>
+ <message>
+ <location line="+247"/>
 <source>Chroma Sample Location:</source>
- <translation type="unfinished"></translation>
+ <translation>色度採樣位置：</translation>
 </message>
 <message>
- <location line="+33"/>
- <source>Full Range Samples</source>
- <translation type="unfinished"></translation>
+ <location line="-1172"/>
+ <source>Reduce Fluctuation After Curve Compression:</source>
+ <translation>減少波動曲線壓縮之後：</translation>
+ </message>
+ <message>
+ <location line="-421"/>
+ <source>Custom Matrix</source>
+ <translation>自訂矩陣</translation>
 </message>
 </context>
 <context>
 <name>x265CustomMatrixDialog</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+14"/>
- <source>x265 Custom Matrix</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Intra 4x4</source>
- <translation type="unfinished"></translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+2372"/>
+ <source>OK</source>
+ <translation>確定</translation>
 </message>
 <message>
- <location line="+28"/>
+ <location line="-2314"/>
 <location line="+446"/>
 <location line="+446"/>
 <location line="+703"/>
 <source>Luma:</source>
- <translation type="unfinished"></translation>
+ <translation>明度:</translation>
 </message>
 <message>
 <location line="-1385"/>
 <location line="+446"/>
 <source>Chroma U/V:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-238"/>
- <source>Inter 4x4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+446"/>
- <source>Intra 8x8</source>
- <translation type="unfinished"></translation>
+ <translation>色度 U/V:</translation>
 </message>
 <message>
- <location line="+703"/>
- <source>Inter 8x8</source>
- <translation type="unfinished"></translation>
+ <location line="+1668"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <location line="+727"/>
+ <location line="-30"/>
 <source>Load File</source>
- <translation type="unfinished"></translation>
+ <translation>載入檔案</translation>
 </message>
 <message>
- <location line="+20"/>
- <source>OK</source>
- <translation type="unfinished"></translation>
+ <location line="-2338"/>
+ <source>x265 Custom Matrix</source>
+ <translation>x265 自訂矩陣</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>Cancel</source>
- <translation type="unfinished"></translation>
+ <location line="+462"/>
+ <source>Inter 4x4</source>
+ <translation>Intra內 4x4</translation>
 </message>
-</context>
-<context>
- <name>x265Dialog</name>
 <message>
- <source>Quantiser:</source>
- <translation type="obsolete">量化值:</translation>
+ <location line="+1149"/>
+ <source>Inter 8x8</source>
+ <translation>Intra內 8x8</translation>
 </message>
 <message>
- <source>MB</source>
- <translation type="obsolete">MB</translation>
+ <location line="-1595"/>
+ <source>Intra 4x4</source>
+ <translation>Intra內 4x4</translation>
 </message>
 <message>
- <source>Average Bitrate:</source>
- <translation type="obsolete">平均位元率:</translation>
+ <location line="+892"/>
+ <source>Intra 8x8</source>
+ <translation>Intra內 8x8</translation>
 </message>
 </context>
 <context>
 <name>xvid4</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
- <location line="+24"/>
- <source>None</source>
- <translation type="unfinished">無</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+71"/>
+ <source>Three threads</source>
+ <translation>三個線程</translation>
 </message>
 <message>
- <location line="-23"/>
- <source>Low</source>
- <translation type="unfinished">低</translation>
+ <location line="-9"/>
+ <source>DCT</source>
+ <translation>DCT</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Medium</source>
- <translation type="unfinished">中</translation>
+ <location line="-24"/>
+ <source>Low</source>
+ <translation>低</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+2"/>
 <source>Full</source>
- <translation type="unfinished">全部</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>H.263</source>
- <translation type="unfinished">H.263</translation>
+ <translation>全部</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+5"/>
 <source>MPEG</source>
- <translation type="unfinished">MPEG</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Custom</source>
- <translation type="unfinished">自訂</translation>
+ <translation>MPEG</translation>
 </message>
 <message>
- <location line="+31"/>
- <source>4:3 (PAL)</source>
- <translation type="unfinished"></translation>
+ <location line="-8"/>
+ <location line="+24"/>
+ <source>None</source>
+ <translation>無</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>4:3 (NTSC)</source>
- <translation type="unfinished"></translation>
+ <location line="+35"/>
+ <source>_Trellis quantization</source>
+ <translation>_網格量化</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>16:9 (PAL)</source>
- <translation type="unfinished"></translation>
+ <location line="-52"/>
+ <source>H.263</source>
+ <translation>H.263</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>16:9 (NTSC)</source>
- <translation type="unfinished"></translation>
+ <location line="+20"/>
+ <source>Qpel8</source>
+ <translation>Qpel8</translation>
 </message>
 <message>
- <location line="+9"/>
- <source>Threading</source>
- <translation type="unfinished">執行緒</translation>
+ <location line="+23"/>
+ <source>MotionEstimation</source>
+ <translation>運動估計</translation>
 </message>
 <message>
- <location line="+40"/>
- <source>Motion Estimation</source>
- <translation type="unfinished">動作估測</translation>
+ <location line="+66"/>
+ <source>Xvid4 MPEG-4 ASP configuration</source>
+ <translation>Xvid4 MPEG-4 ASP配置</translation>
 </message>
 <message>
- <location line="+21"/>
- <source>Rate Control</source>
- <translation type="unfinished">比率控制</translation>
+ <location line="-40"/>
+ <source>_Gop Size:</source>
+ <translation>_Gop大小：</translation>
 </message>
 <message>
- <location line="-45"/>
- <source>Aspect Ratio:</source>
- <translation type="unfinished">外觀比例:</translation>
+ <location line="-35"/>
+ <source>4:3 (NTSC)</source>
+ <translation>4:3 (NTSC)</translation>
 </message>
 <message>
- <location line="+40"/>
+ <location line="+67"/>
 <source>Aspect Ratio</source>
- <translation type="unfinished">外觀比例</translation>
- </message>
- <message>
- <location line="-83"/>
- <source>DCT</source>
- <translation type="unfinished"></translation>
+ <translation>像素比例</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Qpel16</source>
- <translation type="unfinished"></translation>
+ <location line="-73"/>
+ <source>Auto (#cpu)</source>
+ <translation>自動 (#cpu)</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Qpel8</source>
- <translation type="unfinished"></translation>
+ <location line="+8"/>
+ <source>16:9 (NTSC)</source>
+ <translation>16:9 (NTSC)</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Square</source>
- <translation type="unfinished"></translation>
+ <location line="-34"/>
+ <source>Custom</source>
+ <translation>自訂</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>One thread</source>
- <translation type="unfinished"></translation>
+ <location line="+45"/>
+ <source>Mi_n. quantizer:</source>
+ <translation>最_小量化器:</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Two threads)</source>
- <translation type="unfinished"></translation>
+ <location line="-14"/>
+ <source>4:3 (PAL)</source>
+ <translation>4:3 (PAL)</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Three threads</source>
- <translation type="unfinished"></translation>
+ <location line="-38"/>
+ <source>Medium</source>
+ <translation>中</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Auto (#cpu)</source>
- <translation type="unfinished"></translation>
+ <location line="+24"/>
+ <source>Qpel16</source>
+ <translation>Qpel16</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>1:1 (PC)</source>
- <translation type="unfinished"></translation>
+ <location line="+2"/>
+ <source>Square</source>
+ <translation>正方形</translation>
 </message>
 <message>
- <location line="+11"/>
- <source>MotionEstimation</source>
- <translation type="unfinished"></translation>
+ <location line="+34"/>
+ <source>_Quantization type:</source>
+ <translation>量化型式:</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>Mi_n. quantizer:</source>
- <translation type="unfinished"></translation>
+ <location line="+35"/>
+ <source>Quantization</source>
+ <translation>量化</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Ma_x. quantizer:</source>
- <translation type="unfinished"></translation>
+ <location line="-65"/>
+ <source>One thread</source>
+ <translation>一個線程</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>_Trellis quantization</source>
- <translation type="unfinished"></translation>
+ <location line="+20"/>
+ <source>Threading</source>
+ <translation>線程</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="+8"/>
 <source>_Number of B frames:</source>
- <translation type="unfinished"></translation>
+ <translation>B幀的數量</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>_Quantization type:</source>
- <translation type="unfinished"></translation>
+ <location line="+6"/>
+ <source>Profile:</source>
+ <translation>設定檔:</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>_Macroblock decision:</source>
- <translation type="unfinished"></translation>
+ <location line="-33"/>
+ <source>Two threads)</source>
+ <translation>兩個線程</translation>
 </message>
 <message>
- <location line="+2"/>
- <source>Profile:</source>
- <translation type="unfinished"></translation>
+ <location line="+59"/>
+ <source>Motion Estimation</source>
+ <translation>運動估計</translation>
 </message>
 <message>
- <location line="+10"/>
- <source>_Gop Size:</source>
- <translation type="unfinished"></translation>
+ <location line="+9"/>
+ <source>Threads</source>
+ <translation>線程</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Use XVID fcc (else DIVX)</source>
- <translation type="unfinished"></translation>
+ <location line="-59"/>
+ <source>16:9 (PAL)</source>
+ <translation>16:9 (PAL)</translation>
 </message>
 <message>
- <location line="+4"/>
+ <location line="+41"/>
 <source>Advanced Simple Profile</source>
- <translation type="unfinished"></translation>
+ <translation>進階簡單的設定檔</translation>
 </message>
 <message>
- <location line="+14"/>
- <source>Quantization</source>
- <translation type="unfinished"></translation>
+ <location line="-19"/>
+ <source>_Macroblock decision:</source>
+ <translation>宏塊決定:</translation>
 </message>
 <message>
 <location line="+4"/>
- <source>Threads</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+15"/>
- <source>Xvid4 MPEG-4 ASP configuration</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>yadif</name>
- <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
- <source>Yadif</source>
- <translation type="unfinished"></translation>
+ <source>Aspect Ratio:</source>
+ <translation>像素比例(PAR):</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Yadif, port of avisynth version (c) Fizick.</source>
- <translation type="unfinished"></translation>
+ <location line="-29"/>
+ <source>1:1 (PC)</source>
+ <translation>1:1 (PC)</translation>
 </message>
 <message>
- <location line="+53"/>
- <source>Temporal &amp; spatial check</source>
- <translation type="unfinished">時間 &amp; 空間檢查</translation>
+ <location line="+40"/>
+ <source>Use XVID fcc (else DIVX)</source>
+ <translation>使用 XVID fcc (其他 DIVX)</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Bob, temporal &amp; spatial check</source>
- <translation type="unfinished">上下來回，時間 &amp; 空間檢查</translation>
+ <location line="+34"/>
+ <source>Rate Control</source>
+ <translation>比率控制</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>Skip spatial temporal check</source>
- <translation type="unfinished">略過空間時間檢查</translation>
+ <location line="-58"/>
+ <source>Ma_x. quantizer:</source>
+ <translation>最_大.量化器</translation>
 </message>
+</context>
+<context>
+ <name>yadif</name>
 <message>
- <location line="+1"/>
- <source>Bob, skip spatial temporal check</source>
- <translation type="unfinished">上下來回，略過空間時間檢查</translation>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+ <source>Yadif</source>
+ <translation>2.1-亞迪夫(yadif)濾鏡器</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>Bottom field first</source>
- <translation type="unfinished"></translation>
+ <location line="+69"/>
+ <source>yadif</source>
+ <translation>yadif</translation>
 </message>
 <message>
- <location line="+1"/>
+ <location line="-8"/>
 <source>Top field first</source>
- <translation type="unfinished"></translation>
+ <translation>頂部首先掃描</translation>
 </message>
 <message>
- <location line="+3"/>
- <source>_Mode:</source>
- <translation type="unfinished">模式(_M):</translation>
+ <location line="+4"/>
+ <source>_Order:</source>
+ <translation>_命令:</translation>
 </message>
 <message>
- <location line="+1"/>
- <source>_Order:</source>
- <translation type="unfinished">命令(_O):</translation>
+ <location line="-1"/>
+ <source>_Mode:</source>
+ <translation>_模式:</translation>
 </message>
 <message>
- <location line="+4"/>
- <source>yadif</source>
- <translation type="unfinished">yadif</translation>
+ <location line="-63"/>
+ <source>Yadif, port of avisynth version (c) Fizick.</source>
+ <translation>Yadif阜，Avisynth出口商Fizick版本(c)</translation>
 </message>
-</context>
-<context>
- <name>yadifFilter</name>
 <message>
+ <location line="+53"/>
 <source>Temporal &amp; spatial check</source>
- <translation type="obsolete">時間 &amp; 空間檢查</translation>
+ <translation>時間 &amp; 空間檢查</translation>
 </message>
 <message>
+ <location line="+1"/>
 <source>Bob, temporal &amp; spatial check</source>
- <translation type="obsolete">上下來回，時間 &amp; 空間檢查</translation>
- </message>
- <message>
- <source>Skip spatial temporal check</source>
- <translation type="obsolete">略過空間時間檢查</translation>
+ <translation>振動，時間 &amp; 空間檢查</translation>
 </message>
 <message>
+ <location line="+2"/>
 <source>Bob, skip spatial temporal check</source>
- <translation type="obsolete">上下來回，略過空間時間檢查</translation>
- </message>
- <message>
- <source>_Mode:</source>
- <translation type="obsolete">模式(_M):</translation>
+ <translation>振動，略過空間時間檢查</translation>
 </message>
 <message>
- <source>_Order:</source>
- <translation type="obsolete">命令(_O):</translation>
+ <location line="-1"/>
+ <source>Skip spatial temporal check</source>
+ <translation>略過空間時間檢查</translation>
 </message>
 <message>
- <source>yadif</source>
- <translation type="obsolete">yadif</translation>
+ <location line="+4"/>
+ <source>Bottom field first</source>
+ <translation>底部首先掃描</translation>
 </message>
 </context>
 </TS>

avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/qtbase_zh_CN.ts Added

@@ -0,0 +1,6033 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_CN">
+<context>
+ <name>QWidget</name>
+ <message>
+ <source>*</source>
+ <translation>+</translation>
+ </message>
+</context>
+<context>
+ <name>QShortcut</name>
+ <message>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>否</translation>
+ </message>
+ <message>
+ <source>Up</source>
+ <translation>上键</translation>
+ </message>
+ <message>
+ <source>Alt</source>
+ <translation>Alt</translation>
+ </message>
+ <message>
+ <source>F%1</source>
+ <translation>F%1</translation>
+ </message>
+ <message>
+ <source>Del</source>
+ <translation>Del</translation>
+ </message>
+ <message>
+ <source>End</source>
+ <translation>End</translation>
+ </message>
+ <message>
+ <source>Esc</source>
+ <translation>Esc</translation>
+ </message>
+ <message>
+ <source>Ins</source>
+ <translation>Ins</translation>
+ </message>
+ <message>
+ <source>Tab</source>
+ <translation>Tab</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>是</translation>
+ </message>
+ <message>
+ <source>Back</source>
+ <translation>返回</translation>
+ </message>
+ <message>
+ <source>Call</source>
+ <translation>呼叫</translation>
+ </message>
+ <message>
+ <source>Ctrl</source>
+ <translation>Ctrl</translation>
+ </message>
+ <message>
+ <source>Down</source>
+ <translation>下键</translation>
+ </message>
+ <message>
+ <source>Flip</source>
+ <translation>反转</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>说明</translation>
+ </message>
+ <message>
+ <source>Home</source>
+ <translation>Home</translation>
+ </message>
+ <message>
+ <source>Left</source>
+ <translation>左键</translation>
+ </message>
+ <message>
+ <source>Menu</source>
+ <translation>菜单</translation>
+ </message>
+ <message>
+ <source>Meta</source>
+ <translation>Meta</translation>
+ </message>
+ <message>
+ <source>PgUp</source>
+ <translation>PgUp</translation>
+ </message>
+ <message>
+ <source>Stop</source>
+ <translation>停止</translation>
+ </message>
+ <message>
+ <source>Enter</source>
+ <translation>Enter</translation>
+ </message>
+ <message>
+ <source>Pause</source>
+ <translation>Pause</translation>
+ </message>
+ <message>
+ <source>Print</source>
+ <translation>Print</translation>
+ </message>
+ <message>
+ <source>Right</source>
+ <translation>右键</translation>
+ </message>
+ <message>
+ <source>Shift</source>
+ <translation>Shift</translation>
+ </message>
+ <message>
+ <source>Space</source>
+ <translation>空格键</translation>
+ </message>
+ <message>
+ <source>Media Record</source>
+ <translation>媒体录音</translation>
+ </message>
+ <message>
+ <source>Print Screen</source>
+ <translation>打印屏幕</translation>
+ </message>
+ <message>
+ <source>Treble Down</source>
+ <translation>Treble Down</translation>
+ </message>
+ <message>
+ <source>Scroll Lock</source>
+ <translation>滚动条锁定</translation>
+ </message>
+ <message>
+ <source>Volume Down</source>
+ <translation>音量降低</translation>
+ </message>
+ <message>
+ <source>Volume Mute</source>
+ <translation>静音</translation>
+ </message>
+ <message>
+ <source>Media Previous</source>
+ <translation>媒体前一首</translation>
+ </message>
+ <message>
+ <source>Home Page</source>
+ <translation>首页</translation>
+ </message>
+ <message>
+ <source>Volume Up</source>
+ <translation>音量提高</translation>
+ </message>
+ <message>
+ <source>Launch (6)</source>
+ <translation>启动（6）</translation>
+ </message>
+ <message>
+ <source>Launch (7)</source>
+ <translation>启动（7）</translation>
+ </message>
+ <message>
+ <source>Launch (8)</source>
+ <translation>启动（8）</translation>
+ </message>
+ <message>
+ <source>Launch (9)</source>
+ <translation>启动（9）</translation>
+ </message>
+ <message>
+ <source>Launch (2)</source>
+ <translation>启动（2）</translation>
+ </message>
+ <message>
+ <source>Launch (3)</source>
+ <translation>启动（3）</translation>
+ </message>
+ <message>
+ <source>Launch (4)</source>
+ <translation>启动（4）</translation>
+ </message>
+ <message>
+ <source>Launch (5)</source>
+ <translation>启动（5）</translation>
+ </message>
+ <message>
+ <source>Launch (0)</source>
+ <translation>启动（0）</translation>
+ </message>
+ <message>
+ <source>Launch (1)</source>
+ <translation>启动（1）</translation>
+ </message>
+ <message>
+ <source>Launch (F)</source>
+ <translation>启动（F）</translation>
+ </message>
+ <message>
+ <source>Launch (B)</source>
+ <translation>启动（B）</translation>
+ </message>
+ <message>
+ <source>Launch (C)</source>
+ <translation>启动（C）</translation>
+ </message>
+ <message>
+ <source>Launch (D)</source>
+ <translation>启动（D）</translation>
+ </message>
+ <message>
+ <source>Launch (E)</source>
+ <translation>启动（E）</translation>
+ </message>
+ <message>
+ <source>Launch (A)</source>
+ <translation>启动（A）</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <source>Escape</source>
+ <translation>Escape</translation>
+ </message>
+ <message>
+ <source>Hangup</source>
+ <translation>挂断</translation>
+ </message>
+ <message>
+ <source>Insert</source>
+ <translation>插入</translation>
+ </message>
+ <message>
+ <source>Bass Boost</source>
+ <translation>重低音</translation>
+ </message>
+ <message>
+ <source>PgDown</source>
+ <translation>PgDown</translation>
+ </message>
+ <message>
+ <source>Return</source>
+ <translation>Return</translation>
+ </message>
+ <message>
+ <source>Search</source>
+ <translation>搜寻</translation>
+ </message>
+ <message>
+ <source>Select</source>
+ <translation>选择</translation>
+ </message>
+ <message>
+ <source>SysReq</source>
+ <translation>SysReq</translation>
+ </message>
+ <message>
+ <source>NumLock</source>
+ <translation>数字锁定</translation>
+ </message>
+ <message>
+ <source>ScrollLock</source>
+ <translation>滚动条锁定</translation>
+ </message>
+ <message>
+ <source>Context1</source>
+ <translation>内文1</translation>
+ </message>
+ <message>
+ <source>Context2</source>
+ <translation>内文2</translation>
+ </message>
+ <message>
+ <source>Context3</source>
+ <translation>内文3</translation>
+ </message>
+ <message>
+ <source>Context4</source>
+ <translation>内文4</translation>
+ </message>
+ <message>
+ <source>Page Up</source>
+ <translation>往上一页</translation>
+ </message>
+ <message>
+ <source>Open URL</source>
+ <translation>开启网址</translation>
+ </message>
+ <message>
+ <source>Caps Lock</source>
+ <translation>大写锁定</translation>
+ </message>
+ <message>
+ <source>System Request</source>
+ <translation>系统要求 SysRq</translation>
+ </message>
+ <message>
+ <source>CapsLock</source>
+ <translation>大写锁定</translation>
+ </message>
+ <message>
+ <source>Backtab</source>
+ <translation>Backtab</translation>
+ </message>
+ <message>
+ <source>Bass Up</source>
+ <translation>Bass Up</translation>
+ </message>
+ <message>
+ <source>Refresh</source>
+ <translation>刷新</translation>
+ </message>
+ <message>
+ <source>Launch Mail</source>
+ <translation>启动邮件程序</translation>
+ </message>
+ <message>
+ <source>Backspace</source>
+ <translation>Backspace</translation>
+ </message>
+ <message>
+ <source>Bass Down</source>
+ <translation>Bass Down</translation>
+ </message>
+ <message>
+ <source>Standby</source>
+ <translation>待命</translation>
+ </message>
+ <message>
+ <source>Treble Up</source>
+ <translation>Treble Up</translation>
+ </message>
+ <message>
+ <source>Num Lock</source>
+ <translation>数字锁定</translation>
+ </message>
+ <message>
+ <source>Number Lock</source>
+ <translation>数字锁定</translation>
+ </message>
+ <message>
+ <source>Favorites</source>
+ <translation>我的最爱</translation>
+ </message>
+ <message>
+ <source>Forward</source>
+ <translation>往前</translation>
+ </message>
+ <message>
+ <source>Page Down</source>
+ <translation>往下一页</translation>
+ </message>
+ <message>
+ <source>Media Play</source>
+ <translation>媒体播放</translation>
+ </message>
+ <message>
+ <source>Media Stop</source>
+ <translation>媒体停止</translation>
+ </message>
+ <message>
+ <source>Media Next</source>
+ <translation>媒体下一首</translation>
+ </message>
+ <message>
+ <source>Launch Media</source>
+ <translation>启动媒体程序</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintDialog</name>
+ <message>
+ <source>A0</source>
+ <translation>A0</translation>
+ </message>
+ <message>
+ <source>A1</source>
+ <translation>A1</translation>
+ </message>
+ <message>
+ <source>A2</source>
+ <translation>A2</translation>
+ </message>
+ <message>
+ <source>A3</source>
+ <translation>A3</translation>
+ </message>
+ <message>
+ <source>A4</source>
+ <translation>A4</translation>
+ </message>
+ <message>
+ <source>A5</source>
+ <translation>A5</translation>
+ </message>
+ <message>
+ <source>A6</source>
+ <translation>A6</translation>
+ </message>
+ <message>
+ <source>A7</source>
+ <translation>A7</translation>
+ </message>
+ <message>
+ <source>A8</source>
+ <translation>A8</translation>
+ </message>
+ <message>
+ <source>A9</source>
+ <translation>A9</translation>
+ </message>
+ <message>
+ <source>B0</source>
+ <translation>B0</translation>
+ </message>
+ <message>
+ <source>B1</source>
+ <translation>B1</translation>
+ </message>
+ <message>
+ <source>B2</source>
+ <translation>B2</translation>
+ </message>
+ <message>
+ <source>B3</source>
+ <translation>B3</translation>
+ </message>
+ <message>
+ <source>B4</source>
+ <translation>B4</translation>
+ </message>
+ <message>
+ <source>B5</source>
+ <translation>B5</translation>
+ </message>
+ <message>
+ <source>B6</source>
+ <translation>B6</translation>
+ </message>
+ <message>
+ <source>B7</source>
+ <translation>B7</translation>
+ </message>
+ <message>
+ <source>B8</source>
+ <translation>B8</translation>
+ </message>
+ <message>
+ <source>B9</source>
+ <translation>B9</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <source>B10</source>
+ <translation>B10</translation>
+ </message>
+ <message>
+ <source>C5E</source>
+ <translation>C5E</translation>
+ </message>
+ <message>
+ <source>DLE</source>
+ <translation>DLE</translation>
+ </message>
+ <message>
+ <source>A6 (105 x 148 mm)</source>
+ <translation>A6 (105 x 148 mm)</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>
+ </message>
+ <message>
+ <source>Folio</source>
+ <translation>Folio</translation>
+ </message>
+ <message>
+ <source>Legal</source>
+ <translation>Legal</translation>
+ </message>
+ <message>
+ <source>Print all</source>
+ <translation>全部打印</translation>
+ </message>
+ <message>
+ <source>Print</source>
+ <translation>打印</translation>
+ </message>
+ <message>
+ <source>&amp;Options &lt;&lt;</source>
+ <translation>操作 (&amp;O) &lt;&lt;</translation>
+ </message>
+ <message>
+ <source>&amp;Options &gt;&gt;</source>
+ <translation>操作 (&amp;O) &gt;&gt;</translation>
+ </message>
+ <message>
+ <source>B6 (125 x 176 mm)</source>
+ <translation>B6 (125 x 176 mm)</translation>
+ </message>
+ <message>
+ <source>B8 (62 x 88 mm)</source>
+ <translation>B8 (62 x 88 mm)</translation>
+ </message>
+ <message>
+ <source>A8 (52 x 74 mm)</source>
+ <translation>A8 (52 x 74 mm)</translation>
+ </message>
+ <message>
+ <source>B9 (44 x 62 mm)</source>
+ <translation>B9 (44 x 62 mm)</translation>
+ </message>
+ <message>
+ <source>A9 (37 x 52 mm)</source>
+ <translation>A9 (37 x 52 mm)</translation>
+ </message>
+ <message>
+ <source>B0 (1000 x 1414 mm)</source>
+ <translation>B0 (1000 x 1414 mm)</translation>
+ </message>
+ <message>
+ <source>A5 (148 x 210 mm)</source>
+ <translation>A5 (148 x 210 mm)</translation>
+ </message>
+ <message>
+ <source>Tabloid (279 x 432 mm)</source>
+ <translation>Tabloid (279 x 432 mm)</translation>
+ </message>
+ <message>
+ <source>B10 (31 x 44 mm)</source>
+ <translation>B10 (31 x 44 mm)</translation>
+ </message>
+ <message>
+ <source>B2 (500 x 707 mm)</source>
+ <translation>B2 (500 x 707 mm)</translation>
+ </message>
+ <message>
+ <source>&amp;Print</source>
+ <translation>打印(&amp;P)</translation>
+ </message>
+ <message>
+ <source>A3 (297 x 420 mm)</source>
+ <translation>A3 (297 x 420 mm)</translation>
+ </message>
+ <message>
+ <source>Print selection</source>
+ <translation>打印选择区</translation>
+ </message>
+ <message>
+ <source>Print to File (Postscript)</source>
+ <translation>打印到文件（Postscript）</translation>
+ </message>
+ <message>
+ <source>B4 (250 x 353 mm)</source>
+ <translation>B4 (250 x 353 mm)</translation>
+ </message>
+ <message>
+ <source>%1 already exists.
+Do you want to overwrite it?</source>
+ <translation>%1 已存在。
+您要覆写它吗?</translation>
+ </message>
+ <message>
+ <source>A1 (594 x 841 mm)</source>
+ <translation>A1 (594 x 841 mm)</translation>
+ </message>
+ <message>
+ <source>Custom</source>
+ <translation>自定义</translation>
+ </message>
+ <message>
+ <source>B1 (707 x 1000 mm)</source>
+ <translation>B1 (707 x 1000 mm)</translation>
+ </message>
+ <message>
+ <source>Folio (210 x 330 mm)</source>
+ <translation>对开 (210 x 330 mm)</translation>
+ </message>
+ <message>
+ <source>Ledger</source>
+ <translation>Ledger</translation>
+ </message>
+ <message>
+ <source>Letter</source>
+ <translation>Letter</translation>
+ </message>
+ <message>
+ <source>DLE (110 x 220 mm)</source>
+ <translation>DLE (110 x 220 mm)</translation>
+ </message>
+ <message>
+ <source>C5E (163 x 229 mm)</source>
+ <translation>C5E (163 x 229 mm)</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>
+ </message>
+ <message>
+ <source>Print range</source>
+ <translation>打印范围</translation>
+ </message>
+ <message>
+ <source>File exists</source>
+ <translation>文件已存在</translation>
+ </message>
+ <message>
+ <source>Write %1 file</source>
+ <translation>写入 %1 文件</translation>
+ </message>
+ <message>
+ <source>A0 (841 x 1189 mm)</source>
+ <translation>A0 (841 x 1189 mm)</translation>
+ </message>
+ <message>
+ <source>Local file</source>
+ <translation>本地端文件</translation>
+ </message>
+ <message>
+ <source>locally connected</source>
+ <translation>本地连接</translation>
+ </message>
+ <message>
+ <source>Ledger (432 x 279 mm)</source>
+ <translation>Ledger (432 x 279 mm)</translation>
+ </message>
+ <message>
+ <source>Aliases: %1</source>
+ <translation>别名：%1</translation>
+ </message>
+ <message>
+ <source>Print to File (PDF)</source>
+ <translation>打印到文件（PDF）</translation>
+ </message>
+ <message>
+ <source>Print To File ...</source>
+ <translation>打印到文件...</translation>
+ </message>
+ <message>
+ <source>US Common #10 Envelope (105 x 241 mm)</source>
+ <translation>US 常用 10 号信封 (105x241 mm)</translation>
+ </message>
+ <message>
+ <source>Tabloid</source>
+ <translation>Tabloid</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>
+ </message>
+ <message>
+ <source>Executive</source>
+ <translation>Executive</translation>
+ </message>
+ <message>
+ <source>unknown</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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
+ <translation>起始数值不能大于结束数值。</translation>
+ </message>
+ <message>
+ <source>US Common #10 Envelope</source>
+ <translation>US Common #10 Envelope</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>B3 (353 x 500 mm)</source>
+ <translation>B3 (353 x 500 mm)</translation>
+ </message>
+ <message>
+ <source>A7 (74 x 105 mm)</source>
+ <translation>A7 (74 x 105 mm)</translation>
+ </message>
+ <message>
+ <source>A2 (420 x 594 mm)</source>
+ <translation>A2 (420 x 594 mm)</translation>
+ </message>
+ <message>
+ <source>B7 (88 x 125 mm)</source>
+ <translation>B7 (88 x 125 mm)</translation>
+ </message>
+</context>
+<context>
+ <name>QDateTimeEdit</name>
+ <message>
+ <source>AM</source>
+ <translation>AM</translation>
+ </message>
+ <message>
+ <source>PM</source>
+ <translation>PM</translation>
+ </message>
+ <message>
+ <source>am</source>
+ <translation>am</translation>
+ </message>
+ <message>
+ <source>pm</source>
+ <translation>pm</translation>
+ </message>
+</context>
+<context>
+ <name>Q3TabDialog</name>
+ <message>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>说明</translation>
+ </message>
+ <message>
+ <source>Apply</source>
+ <translation>套用</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Defaults</source>
+ <translation>默认</translation>
+ </message>
+</context>
+<context>
+ <name>QAxSelect</name>
+ <message>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <source>COM &amp;Object:</source>
+ <translation>COM &amp;物件:</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;取消</translation>
+ </message>
+ <message>
+ <source>Select ActiveX Control</source>
+ <translation>选择 ActiveX 控制</translation>
+ </message>
+</context>
+<context>
+ <name>QDialogButtonBox</name>
+ <message>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;确定</translation>
+ </message>
+ <message>
+ <source>&amp;No</source>
+ <translation>&amp;否</translation>
+ </message>
+ <message>
+ <source>&amp;Yes</source>
+ <translation>&amp;是</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>说明</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>保存</translation>
+ </message>
+ <message>
+ <source>&amp;Save</source>
+ <translation>&amp;保存</translation>
+ </message>
+ <message>
+ <source>Abort</source>
+ <translation>中止</translation>
+ </message>
+ <message>
+ <source>Apply</source>
+ <translation>套用</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>重置</translation>
+ </message>
+ <message>
+ <source>Retry</source>
+ <translation>重试</translation>
+ </message>
+ <message>
+ <source>Restore Defaults</source>
+ <translation>回复默认值</translation>
+ </message>
+ <message>
+ <source>&amp;Close</source>
+ <translation>&amp;关闭</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <source>Close without Saving</source>
+ <translation>关闭而不保存</translation>
+ </message>
+ <message>
+ <source>N&amp;o to All</source>
+ <translation>全部&amp;回答否</translation>
+ </message>
+ <message>
+ <source>Save All</source>
+ <translation>全部保存</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;取消</translation>
+ </message>
+ <message>
+ <source>Discard</source>
+ <translation>丢弃</translation>
+ </message>
+ <message>
+ <source>Yes to &amp;All</source>
+ <translation>全部&amp;回答是</translation>
+ </message>
+ <message>
+ <source>Don&apos;t Save</source>
+ <translation>不要&apos;保存</translation>
+ </message>
+</context>
+<context>
+ <name>QMessageBox</name>
+ <message>
+ <source>OK</source>
+ <translation>确定</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>说明</translation>
+ </message>
+ <message>
+ <source>Show Details...</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>
+ </message>
+ <message>
+ <source>About Qt</source>
+ <translation>关于 Qt</translation>
+ </message>
+ <message>
+ <source>Hide Details...</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>
+ </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>
+ </message>
+</context>
+<context>
+ <name>QSql</name>
+ <message>
+ <source>No</source>
+ <translation>否</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>是</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <source>Insert</source>
+ <translation>插入</translation>
+ </message>
+ <message>
+ <source>Update</source>
+ <translation>更新</translation>
+ </message>
+ <message>
+ <source>Delete this record?</source>
+ <translation>要删除这笔纪录吗?</translation>
+ </message>
+ <message>
+ <source>Save edits?</source>
+ <translation>要保存编辑过的内容吗?</translation>
+ </message>
+ <message>
+ <source>Confirm</source>
+ <translation>确认</translation>
+ </message>
+ <message>
+ <source>Cancel your edits?</source>
+ <translation>要取消编辑吗?</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintSettingsOutput</name>
+ <message>
+ <source>to</source>
+ <translation>到</translation>
+ </message>
+ <message>
+ <source>Form</source>
+ <translation>窗体</translation>
+ </message>
+ <message>
+ <source>None</source>
+ <translation>无</translation>
+ </message>
+ <message>
+ <source>Color</source>
+ <translation>颜色</translation>
+ </message>
+ <message>
+ <source>Print all</source>
+ <translation>全部打印</translation>
+ </message>
+ <message>
+ <source>Selection</source>
+ <translation>选择区</translation>
+ </message>
+ <message>
+ <source>Long side</source>
+ <translation>长边</translation>
+ </message>
+ <message>
+ <source>Copies</source>
+ <translation>份数</translation>
+ </message>
+ <message>
+ <source>Print range</source>
+ <translation>打印范围</translation>
+ </message>
+ <message>
+ <source>Color Mode</source>
+ <translation>颜色模式</translation>
+ </message>
+ <message>
+ <source>Options</source>
+ <translation>选项</translation>
+ </message>
+ <message>
+ <source>Output Settings</source>
+ <translation>输出设置</translation>
+ </message>
+ <message>
+ <source>Reverse</source>
+ <translation>反向</translation>
+ </message>
+ <message>
+ <source>Grayscale</source>
+ <translation>灰阶</translation>
+ </message>
+ <message>
+ <source>Short side</source>
+ <translation>短边</translation>
+ </message>
+ <message>
+ <source>Collate</source>
+ <translation>校对</translation>
+ </message>
+ <message>
+ <source>Copies:</source>
+ <translation>份数:</translation>
+ </message>
+ <message>
+ <source>Pages from</source>
+ <translation>指定页面：从</translation>
+ </message>
+ <message>
+ <source>Duplex Printing</source>
+ <translation>双工打印</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintPreviewDialog</name>
+ <message>
+ <source>%1%</source>
+ <translation>%1%</translation>
+ </message>
+ <message>
+ <source>Print Preview</source>
+ <translation>打印预览</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>Print</source>
+ <translation>打印</translation>
+ </message>
+ <message>
+ <source>Fit page</source>
+ <translation>符合页面</translation>
+ </message>
+ <message>
+ <source>Zoom in</source>
+ <translation>放大</translation>
+ </message>
+ <message>
+ <source>Landscape</source>
+ <translation>横向</translation>
+ </message>
+ <message>
+ <source>Zoom out</source>
+ <translation>缩小</translation>
+ </message>
+ <message>
+ <source>Fit width</source>
+ <translation>符合宽度</translation>
+ </message>
+ <message>
+ <source>Portrait</source>
+ <translation>纵向</translation>
+ </message>
+ <message>
+ <source>Page Setup</source>
+ <translation>页面设置</translation>
+ </message>
+ <message>
+ <source>Page setup</source>
+ <translation>打印设置</translation>
+ </message>
+ <message>
+ <source>Show overview of all pages</source>
+ <translation>显示所有页面预览</translation>
+ </message>
+ <message>
+ <source>First page</source>
+ <translation>第一页</translation>
+ </message>
+ <message>
+ <source>Last page</source>
+ <translation>最后一页</translation>
+ </message>
+ <message>
+ <source>Show single page</source>
+ <translation>显示单一页面</translation>
+ </message>
+ <message>
+ <source>Export to PDF</source>
+ <translation>汇出到 PDF 檔</translation>
+ </message>
+ <message>
+ <source>Previous page</source>
+ <translation>前一页</translation>
+ </message>
+ <message>
+ <source>Next page</source>
+ <translation>下一页</translation>
+ </message>
+ <message>
+ <source>Show facing pages</source>
+ <translation>显示封面</translation>
+ </message>
+ <message>
+ <source>Export to PostScript</source>
+ <translation>汇出到 PostScript 檔</translation>
+ </message>
+</context>
+<context>
+ <name>Q3FileDialog</name>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;确定</translation>
+ </message>
+ <message>
+ <source>&amp;No</source>
+ <translation>&amp;否</translation>
+ </message>
+ <message>
+ <source>Dir</source>
+ <translation>目录</translation>
+ </message>
+ <message>
+ <source>&amp;Yes</source>
+ <translation>&amp;是</translation>
+ </message>
+ <message>
+ <source>Back</source>
+ <translation>返回</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>日期</translation>
+ </message>
+ <message>
+ <source>File</source>
+ <translation>文件</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>名称</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>大小</translation>
+ </message>
+ <message>
+ <source>Sort</source>
+ <translation>排序</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>型态</translation>
+ </message>
+ <message>
+ <source>&amp;Open</source>
+ <translation>&amp;开启</translation>
+ </message>
+ <message>
+ <source>&amp;Save</source>
+ <translation>&amp;保存</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>错误</translation>
+ </message>
+ <message>
+ <source>Open </source>
+ <translation>开启 </translation>
+ </message>
+ <message>
+ <source>Write: %1</source>
+ <translation>写入：%1</translation>
+ </message>
+ <message>
+ <source>Sort by &amp;Size</source>
+ <translation>依大小&amp;排序</translation>
+ </message>
+ <message>
+ <source>Sort by &amp;Date</source>
+ <translation>依日期&amp;排序</translation>
+ </message>
+ <message>
+ <source>Sort by &amp;Name</source>
+ <translation>依名称&amp;排序</translation>
+ </message>
+ <message>
+ <source>New Folder 1</source>
+ <translation>新文件夹 1</translation>
+ </message>
+ <message>
+ <source>the directory</source>
+ <translation>此目录</translation>
+ </message>
+ <message>
+ <source>File &amp;type:</source>
+ <translation>文件&amp;型态:</translation>
+ </message>
+ <message>
+ <source>File &amp;name:</source>
+ <translation>檔&amp;名:</translation>
+ </message>
+ <message>
+ <source>Delete %1</source>
+ <translation>删除 %1</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>R&amp;eload</source>
+ <translation>重&amp;新载入</translation>
+ </message>
+ <message>
+ <source>New Folder</source>
+ <translation>新文件夹</translation>
+ </message>
+ <message>
+ <source>&amp;Unsorted</source>
+ <translation>未&amp;排序</translation>
+ </message>
+ <message>
+ <source>Look &amp;in:</source>
+ <translation>寻找&amp;于:</translation>
+ </message>
+ <message>
+ <source>Preview File Contents</source>
+ <translation>预览文件内容</translation>
+ </message>
+ <message>
+ <source>New Folder %1</source>
+ <translation>新文件夹 %1</translation>
+ </message>
+ <message>
+ <source>Read-write</source>
+ <translation>可擦写</translation>
+ </message>
+ <message>
+ <source>Read-only</source>
+ <translation>只读</translation>
+ </message>
+ <message>
+ <source>Copy or Move a File</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>
+ </message>
+ <message>
+ <source>Find Directory</source>
+ <translation>寻找目录</translation>
+ </message>
+ <message>
+ <source>Attributes</source>
+ <translation>属性</translation>
+ </message>
+ <message>
+ <source>Show &amp;hidden files</source>
+ <translation>显示&amp;隐藏档</translation>
+ </message>
+ <message>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
+ </message>
+ <message>
+ <source>Inaccessible</source>
+ <translation>无法存取</translation>
+ </message>
+ <message>
+ <source>%1
+File not found.
+Check path and filename.</source>
+ <translation>%1
+找不到文件。
+请检查路径与文件名。</translation>
+ </message>
+ <message>
+ <source>List View</source>
+ <translation>列表检视</translation>
+ </message>
+ <message>
+ <source>Special</source>
+ <translation>特殊节点</translation>
+ </message>
+ <message>
+ <source>Write-only</source>
+ <translation>唯写</translation>
+ </message>
+ <message>
+ <source>the symlink</source>
+ <translation>此符号链接</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;删除</translation>
+ </message>
+ <message>
+ <source>All Files (*)</source>
+ <translation>所有文件 (*)</translation>
+ </message>
+ <message>
+ <source>Directories</source>
+ <translation>目录</translation>
+ </message>
+ <message>
+ <source>Symlink to Special</source>
+ <translation>到特殊节点的符号链接</translation>
+ </message>
+ <message>
+ <source>Select a Directory</source>
+ <translation>请选择一个目录</translation>
+ </message>
+ <message>
+ <source>All Files (*.*)</source>
+ <translation>所有文件 (*.*)</translation>
+ </message>
+ <message>
+ <source>Read: %1</source>
+ <translation>读取：%1</translation>
+ </message>
+ <message>
+ <source>&amp;Rename</source>
+ <translation>&amp;重新命名</translation>
+ </message>
+ <message>
+ <source>Directory:</source>
+ <translation>目录:</translation>
+ </message>
+ <message>
+ <source>One directory up</source>
+ <translation>往上一层目录</translation>
+ </message>
+ <message>
+ <source>Preview File Info</source>
+ <translation>预览文件信息</translation>
+ </message>
+ <message>
+ <source>the file</source>
+ <translation>此文件</translation>
+ </message>
+ <message>
+ <source>Create New Folder</source>
+ <translation>建立新文件夹</translation>
+ </message>
+ <message>
+ <source>Symlink to File</source>
+ <translation>到文件的符号链接</translation>
+ </message>
+ <message>
+ <source>Symlink to Directory</source>
+ <translation>到目录的符号链接</translation>
+ </message>
+ <message>
+ <source>Detail View</source>
+ <translation>详细检视</translation>
+ </message>
+</context>
+<context>
+ <name>QErrorMessage</name>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;确定</translation>
+ </message>
+ <message>
+ <source>Fatal Error:</source>
+ <translation>严重错误:</translation>
+ </message>
+ <message>
+ <source>&amp;Show this message again</source>
+ <translation>&amp;再度显示此讯息</translation>
+ </message>
+ <message>
+ <source>Debug Message:</source>
+ <translation>调试讯息:</translation>
+ </message>
+ <message>
+ <source>Warning:</source>
+ <translation>警告:</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintWidget</name>
+ <message>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <source>Form</source>
+ <translation>窗体</translation>
+ </message>
+ <message>
+ <source>Type:</source>
+ <translation>型态:</translation>
+ </message>
+ <message>
+ <source>&amp;Name:</source>
+ <translation>&amp;名称:</translation>
+ </message>
+ <message>
+ <source>Output &amp;file:</source>
+ <translation>&amp;输出文件:</translation>
+ </message>
+ <message>
+ <source>P&amp;roperties</source>
+ <translation>属&amp;性</translation>
+ </message>
+ <message>
+ <source>Preview</source>
+ <translation>预览</translation>
+ </message>
+ <message>
+ <source>Printer</source>
+ <translation>打印机</translation>
+ </message>
+ <message>
+ <source>Location:</source>
+ <translation>位置:</translation>
+ </message>
+</context>
+<context>
+ <name>QFontDatabase</name>
+ <message>
+ <source>Any</source>
+ <translation>任何</translation>
+ </message>
+ <message>
+ <source>Lao</source>
+ <translation>寮国</translation>
+ </message>
+ <message>
+ <source>Bold</source>
+ <translation>粗体</translation>
+ </message>
+ <message>
+ <source>Demi</source>
+ <translation>半体</translation>
+ </message>
+ <message>
+ <source>Thai</source>
+ <translation>泰语</translation>
+ </message>
+ <message>
+ <source>Black</source>
+ <translation>黑体</translation>
+ </message>
+ <message>
+ <source>Greek</source>
+ <translation>希腊</translation>
+ </message>
+ <message>
+ <source>Khmer</source>
+ <translation>高棉</translation>
+ </message>
+ <message>
+ <source>Latin</source>
+ <translation>拉丁</translation>
+ </message>
+ <message>
+ <source>Light</source>
+ <translation>轻体</translation>
+ </message>
+ <message>
+ <source>Ogham</source>
+ <translation>欧甘</translation>
+ </message>
+ <message>
+ <source>Oriya</source>
+ <translation>Oriya</translation>
+ </message>
+ <message>
+ <source>Runic</source>
+ <translation>卢恩</translation>
+ </message>
+ <message>
+ <source>Tamil</source>
+ <translation>坦米尔</translation>
+ </message>
+ <message>
+ <source>Cyrillic</source>
+ <translation>斯拉夫</translation>
+ </message>
+ <message>
+ <source>Kannada</source>
+ <translation>坎达那</translation>
+ </message>
+ <message>
+ <source>Malayalam</source>
+ <translation>马来语</translation>
+ </message>
+ <message>
+ <source>Simplified Chinese</source>
+ <translation>简体中文</translation>
+ </message>
+ <message>
+ <source>Demi Bold</source>
+ <translation>半粗体</translation>
+ </message>
+ <message>
+ <source>Arabic</source>
+ <translation>阿拉伯</translation>
+ </message>
+ <message>
+ <source>Hebrew</source>
+ <translation>希伯来</translation>
+ </message>
+ <message>
+ <source>Myanmar</source>
+ <translation>缅甸</translation>
+ </message>
+ <message>
+ <source>Italic</source>
+ <translation>斜体</translation>
+ </message>
+ <message>
+ <source>Korean</source>
+ <translation>韩语</translation>
+ </message>
+ <message>
+ <source>Normal</source>
+ <translation>正常</translation>
+ </message>
+ <message>
+ <source>Oblique</source>
+ <translation>倾斜体</translation>
+ </message>
+ <message>
+ <source>Telugu</source>
+ <translation>Telugu</translation>
+ </message>
+ <message>
+ <source>Thaana</source>
+ <translation>Thaana</translation>
+ </message>
+ <message>
+ <source>Symbol</source>
+ <translation>符号</translation>
+ </message>
+ <message>
+ <source>Syriac</source>
+ <translation>叙利亚</translation>
+ </message>
+ <message>
+ <source>Devanagari</source>
+ <translation>Devanagari</translation>
+ </message>
+ <message>
+ <source>Japanese</source>
+ <translation>日语</translation>
+ </message>
+ <message>
+ <source>Bengali</source>
+ <translation>孟加拉国</translation>
+ </message>
+ <message>
+ <source>Armenian</source>
+ <translation>亚美尼亚</translation>
+ </message>
+ <message>
+ <source>Sinhala</source>
+ <translation>锡兰</translation>
+ </message>
+ <message>
+ <source>Tibetan</source>
+ <translation>西藏</translation>
+ </message>
+ <message>
+ <source>Vietnamese</source>
+ <translation>越南</translation>
+ </message>
+ <message>
+ <source>Gujarati</source>
+ <translation>Gujarati</translation>
+ </message>
+ <message>
+ <source>Traditional Chinese</source>
+ <translation>繁体中文</translation>
+ </message>
+ <message>
+ <source>Georgian</source>
+ <translation>乔治亚</translation>
+ </message>
+ <message>
+ <source>Gurmukhi</source>
+ <translation>Gurmukhi</translation>
+ </message>
+</context>
+<context>
+ <name>QWebPage</name>
+ <message>
+ <source>Cut</source>
+ <translation>剪切</translation>
+ </message>
+ <message>
+ <source>LTR</source>
+ <translation>左到右</translation>
+ </message>
+ <message>
+ <source>RTL</source>
+ <translation>右到左</translation>
+ </message>
+ <message>
+ <source>Top</source>
+ <translation>顶端</translation>
+ </message>
+ <message>
+ <source>Bold</source>
+ <translation>粗体</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation>复制</translation>
+ </message>
+ <message>
+ <source>Stop</source>
+ <translation>停止</translation>
+ </message>
+ <message>
+ <source>Open Frame</source>
+ <translation>开启框架</translation>
+ </message>
+ <message>
+ <source>Open Image</source>
+ <translation>开启影像</translation>
+ </message>
+ <message>
+ <source>Fonts</source>
+ <translation>字型</translation>
+ </message>
+ <message>
+ <source>Paste</source>
+ <translation>粘贴</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>重置</translation>
+ </message>
+ <message>
+ <source>Inspect</source>
+ <translation>查验</translation>
+ </message>
+ <message>
+ <source>Select to the start of the block</source>
+ <translation>选择到这一个区块的起头</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the end of the block</source>
+ <translation>移动光标到这一个区块的结尾</translation>
+ </message>
+ <message>
+ <source>Select to the start of the line</source>
+ <translation>选择到这一行的起头</translation>
+ </message>
+ <message>
+ <source>Look Up In Dictionary</source>
+ <translation>在字典里搜寻</translation>
+ </message>
+ <message>
+ <source>Search The Web</source>
+ <translation>搜寻站台</translation>
+ </message>
+ <message>
+ <source>Check Spelling While Typing</source>
+ <translation>打字时立即检查拼字</translation>
+ </message>
+ <message>
+ <source>Add To Dictionary</source>
+ <translation>新增到字典</translation>
+ </message>
+ <message>
+ <source>Delete to the start of the word</source>
+ <translation>删除到此单字的起头</translation>
+ </message>
+ <message>
+ <source>Recent searches</source>
+ <translation>最近的搜寻</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the next word</source>
+ <translation>移动光标到下一个单字</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the next line</source>
+ <translation>移动光标到下一行</translation>
+ </message>
+ <message>
+ <source>JavaScript Alert - %1</source>
+ <translation>JavaScript 警告 ─ %1</translation>
+ </message>
+ <message>
+ <source>Scroll down</source>
+ <translation>往下滚动条</translation>
+ </message>
+ <message>
+ <source>Scroll here</source>
+ <translation>在此滚动条</translation>
+ </message>
+ <message>
+ <source>Scroll left</source>
+ <translation>往左滚动条</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the start of the block</source>
+ <translation>移动光标到这一个区块的起头</translation>
+ </message>
+ <message>
+ <source>Text Direction</source>
+ <translation>文本方向</translation>
+ </message>
+ <message>
+ <source>Bottom</source>
+ <translation>底端</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <source>Italic</source>
+ <translation>斜体</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the end of the line</source>
+ <translation>移动光标到这一行的结尾</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the start of the line</source>
+ <translation>移动光标到这一行的起头</translation>
+ </message>
+ <message>
+ <source>Reload</source>
+ <translation>重载</translation>
+ </message>
+ <message>
+ <source>JavaScript Confirm - %1</source>
+ <translation>JavaScript 确认 ─ %1</translation>
+ </message>
+ <message>
+ <source>Submit</source>
+ <translation>提交</translation>
+ </message>
+ <message>
+ <source>Web Inspector - %2</source>
+ <translation>网站查验器─%2</translation>
+ </message>
+ <message>
+ <source>Page up</source>
+ <translation>页面上方</translation>
+ </message>
+ <message>
+ <source>Spelling</source>
+ <translation>拼字</translation>
+ </message>
+ <message>
+ <source>Outline</source>
+ <translation>外框线</translation>
+ </message>
+ <message>
+ <source>Check Grammar With Spelling</source>
+ <translation>检查拼字与文法</translation>
+ </message>
+ <message>
+ <source>No file selected</source>
+ <translation>未选取任何文件</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <comment>Ignore Grammar context menu item</comment>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <source>Save Image</source>
+ <translation>保存影像</translation>
+ </message>
+ <message>
+ <source>Save Link...</source>
+ <translation>保存连结...</translation>
+ </message>
+ <message>
+ <source>No recent searches</source>
+ <translation>没有最近的搜寻</translation>
+ </message>
+ <message>
+ <source>Page right</source>
+ <translation>页面右方</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the start of the document</source>
+ <translation>移动光标到这一个文檔的起头</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the next character</source>
+ <translation>移动光标到下一个字符</translation>
+ </message>
+ <message>
+ <source>JavaScript Prompt - %1</source>
+ <translation>JavaScript 提示 ─ %1</translation>
+ </message>
+ <message>
+ <source>Copy Link</source>
+ <translation>复制连结</translation>
+ </message>
+ <message>
+ <source>Select to the previous line</source>
+ <translation>选择到前一行</translation>
+ </message>
+ <message>
+ <source>Select to the previous word</source>
+ <translation>选择到前一个单字</translation>
+ </message>
+ <message>
+ <source>Check Spelling</source>
+ <translation>检查拼字</translation>
+ </message>
+ <message>
+ <source>Select to the next character</source>
+ <translation>选择到下一个字符</translation>
+ </message>
+ <message>
+ <source>Show Spelling and Grammar</source>
+ <translation>显示拼字与文法</translation>
+ </message>
+ <message>
+ <source>Delete to the end of the word</source>
+ <translation>删除到此单字的结尾</translation>
+ </message>
+ <message>
+ <source>Direction</source>
+ <translation>方向</translation>
+ </message>
+ <message>
+ <source>Select to the end of the line</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>
+ </message>
+ <message>
+ <source>Choose File</source>
+ <translation>选择文件</translation>
+ </message>
+ <message>
+ <source>Scroll up</source>
+ <translation>往上滚动条</translation>
+ </message>
+ <message>
+ <source>Clear recent searches</source>
+ <translation>清除最近的搜寻</translation>
+ </message>
+ <message>
+ <source>Select to the start of the document</source>
+ <translation>选择到这一个文檔的起头</translation>
+ </message>
+ <message>
+ <source>Default</source>
+ <translation>默认</translation>
+ </message>
+ <message>
+ <source>Underline</source>
+ <translation>底线</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the previous character</source>
+ <translation>移动光标到前一个字符</translation>
+ </message>
+ <message>
+ <source>Copy Image</source>
+ <translation>复制影像</translation>
+ </message>
+ <message>
+ <source>Select to the end of the document</source>
+ <translation>选择到这一个文檔的结尾</translation>
+ </message>
+ <message>
+ <source>Select to the end of the block</source>
+ <translation>选择到这一个区块的结尾</translation>
+ </message>
+ <message>
+ <source>Scroll right</source>
+ <translation>往右滚动条</translation>
+ </message>
+ <message>
+ <source>No Guesses Found</source>
+ <translation>找不到可能的内容</translation>
+ </message>
+ <message>
+ <source>Open Link</source>
+ <translation>开启连结</translation>
+ </message>
+ <message>
+ <source>Bad HTTP request</source>
+ <translation>不良的 HTTP 请求</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the previous word</source>
+ <translation>移动光标到前一个单字</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the previous line</source>
+ <translation>移动光标到前一行</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n file(s)</source>
+ <translation>
+ <numerusform>%n 个文件</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Left edge</source>
+ <translation>左边缘</translation>
+ </message>
+ <message>
+ <source>Go Forward</source>
+ <translation>往前</translation>
+ </message>
+ <message>
+ <source>Page down</source>
+ <translation>页面下方</translation>
+ </message>
+ <message>
+ <source>Page left</source>
+ <translation>页面左方</translation>
+ </message>
+ <message>
+ <source>This is a searchable index. Enter search keywords: </source>
+ <translation>这是可搜寻的索引。请输入关键词: </translation>
+ </message>
+ <message>
+ <source>Select to the previous character</source>
+ <translation>选择到前一个字符</translation>
+ </message>
+ <message>
+ <source>Go Back</source>
+ <translation>往回</translation>
+ </message>
+ <message>
+ <source>Open in New Window</source>
+ <translation>在新窗口开启</translation>
+ </message>
+ <message>
+ <source>Right edge</source>
+ <translation>右边缘</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the end of the document</source>
+ <translation>移动光标到这一个文檔的结尾</translation>
+ </message>
+ <message>
+ <source>Hide Spelling and Grammar</source>
+ <translation>隐藏拼字与文法</translation>
+ </message>
+ <message>
+ <source>%1 (%2x%3 pixels)</source>
+ <translation>%1（%2x%3 像素）</translation>
+ </message>
+ <message>
+ <source>Select to the next word</source>
+ <translation>选择到下一个单字</translation>
+ </message>
+ <message>
+ <source>Select to the next line</source>
+ <translation>选择到下一行</translation>
+ </message>
+</context>
+<context>
+ <name>QScrollBar</name>
+ <message>
+ <source>Top</source>
+ <translation>顶端</translation>
+ </message>
+ <message>
+ <source>Scroll down</source>
+ <translation>往下滚动条</translation>
+ </message>
+ <message>
+ <source>Scroll here</source>
+ <translation>在此滚动条</translation>
+ </message>
+ <message>
+ <source>Scroll left</source>
+ <translation>往左滚动条</translation>
+ </message>
+ <message>
+ <source>Line up</source>
+ <translation>对上排列</translation>
+ </message>
+ <message>
+ <source>Line down</source>
+ <translation>对下排列</translation>
+ </message>
+ <message>
+ <source>Bottom</source>
+ <translation>底端</translation>
+ </message>
+ <message>
+ <source>Page up</source>
+ <translation>页面上方</translation>
+ </message>
+ <message>
+ <source>Position</source>
+ <translation>位置</translation>
+ </message>
+ <message>
+ <source>Page right</source>
+ <translation>页面右方</translation>
+ </message>
+ <message>
+ <source>Scroll up</source>
+ <translation>往上滚动条</translation>
+ </message>
+ <message>
+ <source>Scroll right</source>
+ <translation>往右滚动条</translation>
+ </message>
+ <message>
+ <source>Left edge</source>
+ <translation>左边缘</translation>
+ </message>
+ <message>
+ <source>Page down</source>
+ <translation>页面下方</translation>
+ </message>
+ <message>
+ <source>Page left</source>
+ <translation>页面左方</translation>
+ </message>
+ <message>
+ <source>Right edge</source>
+ <translation>右边缘</translation>
+ </message>
+</context>
+<context>
+ <name>QInputContext</name>
+ <message>
+ <source>XIM</source>
+ <translation>XIM</translation>
+ </message>
+ <message>
+ <source>Windows input method</source>
+ <translation>Windows 输入法</translation>
+ </message>
+ <message>
+ <source>XIM input method</source>
+ <translation>XIM 输入法</translation>
+ </message>
+ <message>
+ <source>Mac OS X input method</source>
+ <translation>Mac OS X 输入法</translation>
+ </message>
+</context>
+<context>
+ <name>QFileDialog</name>
+ <message>
+ <source>Back</source>
+ <translation>返回</translation>
+ </message>
+ <message>
+ <source>File</source>
+ <translation>文件</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+ <message>
+ <source>&amp;Open</source>
+ <translation>&amp;开启</translation>
+ </message>
+ <message>
+ <source>&amp;Save</source>
+ <translation>&amp;保存</translation>
+ </message>
+ <message>
+ <source>Drive</source>
+ <translation>磁盘</translation>
+ </message>
+ <message>
+ <source>Show </source>
+ <translation>显示 </translation>
+ </message>
+ <message>
+ <source>&apos;%1&apos; is write protected.
+Do you want to delete it anyway?</source>
+ <translation>&apos;%1&apos; 有写入保护。
+您确定要删除它吗?</translation>
+ </message>
+ <message>
+ <source>File &amp;name:</source>
+ <translation>檔&amp;名:</translation>
+ </message>
+ <message>
+ <source>New Folder</source>
+ <translation>新文件夹</translation>
+ </message>
+ <message>
+ <source>Parent Directory</source>
+ <translation>父目录</translation>
+ </message>
+ <message>
+ <source>&amp;New Folder</source>
+ <translation>&amp;新增文件夹</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>移除</translation>
+ </message>
+ <message>
+ <source>My Computer</source>
+ <translation>我的计算器</translation>
+ </message>
+ <message>
+ <source>Look in:</source>
+ <translation>寻找:</translation>
+ </message>
+ <message>
+ <source>Files of type:</source>
+ <translation>文件型态:</translation>
+ </message>
+ <message>
+ <source>Find Directory</source>
+ <translation>寻找目录</translation>
+ </message>
+ <message>
+ <source>Show &amp;hidden files</source>
+ <translation>显示&amp;隐藏档</translation>
+ </message>
+ <message>
+ <source>Are sure you want to delete &apos;%1&apos;?</source>
+ <translation>您确定要删除&apos;%1&apos;</translation>
+ </message>
+ <message>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
+ </message>
+ <message>
+ <source>%1
+Directory not found.
+Please verify the correct directory name was given.</source>
+ <translation>%1
+找不到目录。
+请检查目录名称是否正确。</translation>
+ </message>
+ <message>
+ <source>List View</source>
+ <translation>列表检视</translation>
+ </message>
+ <message>
+ <source>&amp;Choose</source>
+ <translation>&amp;选择</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;删除</translation>
+ </message>
+ <message>
+ <source>All Files (*)</source>
+ <translation>所有文件 (*)</translation>
+ </message>
+ <message>
+ <source>Directories</source>
+ <translation>目录</translation>
+ </message>
+ <message>
+ <source>All Files (*.*)</source>
+ <translation>所有文件 (*.*)</translation>
+ </message>
+ <message>
+ <source>&amp;Rename</source>
+ <translation>&amp;重新命名</translation>
+ </message>
+ <message>
+ <source>Could not delete directory.</source>
+ <translation>无法删除目录。</translation>
+ </message>
+ <message>
+ <source>Directory:</source>
+ <translation>目录:</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+ <message>
+ <source>%1 already exists.
+Do you want to replace it?</source>
+ <translation>%1 已存在
+您要取代它吗?</translation>
+ </message>
+ <message>
+ <source>Forward</source>
+ <translation>往前</translation>
+ </message>
+ <message>
+ <source>Recent Places</source>
+ <translation>最近的地方</translation>
+ </message>
+ <message>
+ <source>Create New Folder</source>
+ <translation>建立新文件夹</translation>
+ </message>
+ <message>
+ <source>Detail View</source>
+ <translation>详细检视</translation>
+ </message>
+ <message>
+ <source>%1
+File not found.
+Please verify the correct file name was given.</source>
+ <translation>%1
+找不到文件。
+请检查档名是否正确。</translation>
+ </message>
+</context>
+<context>
+ <name>Q3TextEdit</name>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>剪&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;复制</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>&amp;重做</translation>
+ </message>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>&amp;复原</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>清除</translation>
+ </message>
+ <message>
+ <source>Paste</source>
+ <translation>粘贴</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全部选择</translation>
+ </message>
+</context>
+<context>
+ <name>QLineEdit</name>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>剪&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;复制</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>&amp;重做</translation>
+ </message>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>&amp;复原</translation>
+ </message>
+ <message>
+ <source>&amp;Paste</source>
+ <translation>&amp;粘贴</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全部选择</translation>
+ </message>
+</context>
+<context>
+ <name>QTextControl</name>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>剪&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;复制</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>&amp;重做</translation>
+ </message>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>&amp;复原</translation>
+ </message>
+ <message>
+ <source>&amp;Paste</source>
+ <translation>&amp;粘贴</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全部选择</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Link Location</source>
+ <translation>复制&amp;链接地址</translation>
+ </message>
+</context>
+<context>
+ <name>QDockWidget</name>
+ <message>
+ <source>Dock</source>
+ <translation>嵌入</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>Float</source>
+ <translation>飘浮</translation>
+ </message>
+</context>
+<context>
+ <name>QDialog</name>
+ <message>
+ <source>Done</source>
+ <translation>完成</translation>
+ </message>
+ <message>
+ <source>What&apos;s This?</source>
+ <translation>这是&apos;什么?</translation>
+ </message>
+</context>
+<context>
+ <name>QWizard</name>
+ <message>
+ <source>Done</source>
+ <translation>完成</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>说明</translation>
+ </message>
+ <message>
+ <source>&amp;Help</source>
+ <translation>&amp;说明</translation>
+ </message>
+ <message>
+ <source>&amp;Next</source>
+ <translation>&amp;下一个</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Commit</source>
+ <translation>提交</translation>
+ </message>
+ <message>
+ <source>Continue</source>
+ <translation>继续</translation>
+ </message>
+ <message>
+ <source>&amp;Finish</source>
+ <translation>&amp;完成</translation>
+ </message>
+ <message>
+ <source>&amp;Next &gt;</source>
+ <translation>&amp;下一个 &gt;＞</translation>
+ </message>
+ <message>
+ <source>Go Back</source>
+ <translation>往回</translation>
+ </message>
+ <message>
+ <source>&lt; &amp;Back</source>
+ <translation>＜&lt; &amp;返回</translation>
+ </message>
+</context>
+<context>
+ <name>QPageSetupWidget</name>
+ <message>
+ <source>Form</source>
+ <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>
+ </message>
+ <message>
+ <source>Centimeters (cm)</source>
+ <translation>公分</translation>
+ </message>
+ <message>
+ <source>right margin</source>
+ <translation>右缘</translation>
+ </message>
+ <message>
+ <source>Margins</source>
+ <translation>边缘</translation>
+ </message>
+ <message>
+ <source>Landscape</source>
+ <translation>横向</translation>
+ </message>
+ <message>
+ <source>Width:</source>
+ <translation>宽度:</translation>
+ </message>
+ <message>
+ <source>Orientation</source>
+ <translation>方向</translation>
+ </message>
+ <message>
+ <source>Portrait</source>
+ <translation>纵向</translation>
+ </message>
+ <message>
+ <source>top margin</source>
+ <translation>上缘</translation>
+ </message>
+ <message>
+ <source>left margin</source>
+ <translation>左缘</translation>
+ </message>
+ <message>
+ <source>Page size:</source>
+ <translation>纸张大小:</translation>
+ </message>
+ <message>
+ <source>Reverse portrait</source>
+ <translation>反序纵向</translation>
+ </message>
+ <message>
+ <source>Millimeters (mm)</source>
+ <translation>公厘</translation>
+ </message>
+ <message>
+ <source>Points (pt)</source>
+ <translation>点</translation>
+ </message>
+ <message>
+ <source>Inches (in)</source>
+ <translation>英吋</translation>
+ </message>
+ <message>
+ <source>Reverse landscape</source>
+ <translation>反序横向</translation>
+ </message>
+ <message>
+ <source>Height:</source>
+ <translation>高度:</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintPropertiesWidget</name>
+ <message>
+ <source>Form</source>
+ <translation>窗体</translation>
+ </message>
+ <message>
+ <source>Page</source>
+ <translation>页面</translation>
+ </message>
+ <message>
+ <source>Advanced</source>
+ <translation>高级</translation>
+ </message>
+</context>
+<context>
+ <name>QMdiSubWindow</name>
+ <message>
+ <source>Help</source>
+ <translation>说明</translation>
+ </message>
+ <message>
+ <source>Menu</source>
+ <translation>菜单</translation>
+ </message>
+ <message>
+ <source>&amp;Move</source>
+ <translation>&amp;移动</translation>
+ </message>
+ <message>
+ <source>&amp;Size</source>
+ <translation>&amp;大小</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>Minimize</source>
+ <translation>最小化</translation>
+ </message>
+ <message>
+ <source>Shade</source>
+ <translation>遮蔽</translation>
+ </message>
+ <message>
+ <source>Stay on &amp;Top</source>
+ <translation>留在&amp;顶端</translation>
+ </message>
+ <message>
+ <source>&amp;Close</source>
+ <translation>&amp;关闭</translation>
+ </message>
+ <message>
+ <source>- [%1]</source>
+ <translation>- [%1]</translation>
+ </message>
+ <message>
+ <source>%1 - [%2]</source>
+ <translation>%1 - [%2]</translation>
+ </message>
+ <message>
+ <source>&amp;Restore</source>
+ <translation>&amp;回复</translation>
+ </message>
+ <message>
+ <source>Restore</source>
+ <translation>回复</translation>
+ </message>
+ <message>
+ <source>Maximize</source>
+ <translation>最大化</translation>
+ </message>
+ <message>
+ <source>Unshade</source>
+ <translation>取消遮蔽</translation>
+ </message>
+ <message>
+ <source>Mi&amp;nimize</source>
+ <translation>最小&amp;化</translation>
+ </message>
+ <message>
+ <source>Ma&amp;ximize</source>
+ <translation>最大&amp;化</translation>
+ </message>
+ <message>
+ <source>Restore Down</source>
+ <translation>向下恢复</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <source>Home</source>
+ <translation>首页</translation>
+ </message>
+ <message>
+ <source>Protocol error: packet of size 0 received</source>
+ <translation>协议错误：接收到大小为 0 的封包</translation>
+ </message>
+ <message>
+ <source>Invalid URI: %1</source>
+ <translation>不合法的网址：%1</translation>
+ </message>
+ <message>
+ <source>Socket error on %1: %2</source>
+ <translation>%1 上发生 socket 错误：%2</translation>
+ </message>
+ <message>
+ <source>No host name given</source>
+ <translation>未指定主机</translation>
+ </message>
+ <message>
+ <source>Read error reading from %1: %2</source>
+ <translation>从 %1 读取错误：%2</translation>
+ </message>
+ <message>
+ <source>Remote host closed the connection prematurely on %1</source>
+ <translation>于 %1 上远程主机关闭了不正常的联机</translation>
+ </message>
+ <message>
+ <source>Operation not supported on %1</source>
+ <translation>在 %1 上不支持此操作</translation>
+ </message>
+ <message>
+ <source>Write error writing to %1: %2</source>
+ <translation>写入 %1 时发生错误：%2</translation>
+ </message>
+</context>
+<context>
+ <name>QDirModel</name>
+ <message>
+ <source>Kind</source>
+ <translation>种类</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>名称</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>大小</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>型态</translation>
+ </message>
+ <message>
+ <source>Date Modified</source>
+ <translation>变更日期</translation>
+ </message>
+</context>
+<context>
+ <name>QFileSystemModel</name>
+ <message>
+ <source>Kind</source>
+ <translation>种类</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>名称</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>大小</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>型态</translation>
+ </message>
+ <message>
+ <source>%1 GB</source>
+ <translation>%1 GB</translation>
+ </message>
+ <message>
+ <source>%1 KB</source>
+ <translation>%1 KB</translation>
+ </message>
+ <message>
+ <source>%1 MB</source>
+ <translation>%1 MB</translation>
+ </message>
+ <message>
+ <source>%1 TB</source>
+ <translation>%1 TB</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>
+ </message>
+ <message>
+ <source>%1 bytes</source>
+ <translation>%1 比特组</translation>
+ </message>
+ <message>
+ <source>My Computer</source>
+ <translation>我的计算器</translation>
+ </message>
+ <message>
+ <source>Computer</source>
+ <translation>计算器</translation>
+ </message>
+ <message>
+ <source>Invalid filename</source>
+ <translation>不合法的檔名</translation>
+ </message>
+ <message>
+ <source>Date Modified</source>
+ <translation>变更日期</translation>
+ </message>
+</context>
+<context>
+ <name>QDoubleSpinBox</name>
+ <message>
+ <source>Less</source>
+ <translation>较少</translation>
+ </message>
+ <message>
+ <source>More</source>
+ <translation>更多</translation>
+ </message>
+</context>
+<context>
+ <name>QSpinBox</name>
+ <message>
+ <source>Less</source>
+ <translation>较少</translation>
+ </message>
+ <message>
+ <source>More</source>
+ <translation>更多</translation>
+ </message>
+</context>
+<context>
+ <name>QPPDOptionsModel</name>
+ <message>
+ <source>Name</source>
+ <translation>名称</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation>值</translation>
+ </message>
+</context>
+<context>
+ <name>QComboBox</name>
+ <message>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+ <message>
+ <source>True</source>
+ <translation>真</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>False</source>
+ <translation>假</translation>
+ </message>
+</context>
+<context>
+ <name>QMenu</name>
+ <message>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>Execute</source>
+ <translation>执行</translation>
+ </message>
+</context>
+<context>
+ <name>QPushButton</name>
+ <message>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+</context>
+<context>
+ <name>QToolButton</name>
+ <message>
+ <source>Open</source>
+ <translation>开启</translation>
+ </message>
+ <message>
+ <source>Press</source>
+ <translation>按下</translation>
+ </message>
+</context>
+<context>
+ <name>QUndoGroup</name>
+ <message>
+ <source>Redo</source>
+ <translation>重做</translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation>复原</translation>
+ </message>
+</context>
+<context>
+ <name>QUndoStack</name>
+ <message>
+ <source>Redo</source>
+ <translation>重做</translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation>复原</translation>
+ </message>
+</context>
+<context>
+ <name>Q3DataTable</name>
+ <message>
+ <source>True</source>
+ <translation>真</translation>
+ </message>
+ <message>
+ <source>False</source>
+ <translation>假</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <source>Insert</source>
+ <translation>插入</translation>
+ </message>
+ <message>
+ <source>Update</source>
+ <translation>更新</translation>
+ </message>
+</context>
+<context>
+ <name>QSslSocket</name>
+ <message>
+ <source>Error creating SSL session: %1</source>
+ <translation>建立 SSL 会话时发生错误：%1</translation>
+ </message>
+ <message>
+ <source>Error creating SSL session, %1</source>
+ <translation>建立 SSL 会话时发生错误：%1</translation>
+ </message>
+ <message>
+ <source>Cannot provide a certificate with no key, %1</source>
+ <translation>没有密钥无法提供凭证：%1</translation>
+ </message>
+ <message>
+ <source>Unable to write data: %1</source>
+ <translation>无法写入数据：%1</translation>
+ </message>
+ <message>
+ <source>Error during SSL handshake: %1</source>
+ <translation>SSL 同步时发生错误：%1</translation>
+ </message>
+ <message>
+ <source>Error loading local certificate, %1</source>
+ <translation>加载本地凭证时发生错误：%1</translation>
+ </message>
+ <message>
+ <source>Invalid or empty cipher list (%1)</source>
+ <translation>不合法或空白的加密清单（%1）</translation>
+ </message>
+ <message>
+ <source>Private key does not certificate public key, %1</source>
+ <translation>私钥无法认证公钥，%1</translation>
+ </message>
+ <message>
+ <source>Error creating SSL context (%1)</source>
+ <translation>建立 SSL 内文时发生错误（%1）</translation>
+ </message>
+ <message>
+ <source>Error while reading: %1</source>
+ <translation>读取时发生错误：%1</translation>
+ </message>
+ <message>
+ <source>Error loading private key, %1</source>
+ <translation>加载私钥时发生错误：%1</translation>
+ </message>
+</context>
+<context>
+ <name>QLocalSocket</name>
+ <message>
+ <source>%1: Connection error</source>
+ <translation>%1：联机错误</translation>
+ </message>
+ <message>
+ <source>%1: Connection refused</source>
+ <translation>%1：联机被拒</translation>
+ </message>
+ <message>
+ <source>%1: Unknown error %2</source>
+ <translation>%1：未知的错误 %2</translation>
+ </message>
+ <message>
+ <source>%1: Socket access error</source>
+ <translation>%1：Socket 地址错误</translation>
+ </message>
+ <message>
+ <source>%1: Socket resource error</source>
+ <translation>%1：Socket 资源错误</translation>
+ </message>
+ <message>
+ <source>%1: The socket operation is not supported</source>
+ <translation>%1：socket 操作未支持</translation>
+ </message>
+ <message>
+ <source>%1: Invalid name</source>
+ <translation>%1：不合法的名称</translation>
+ </message>
+ <message>
+ <source>%1: Unknown error</source>
+ <translation>%1：未知的错误</translation>
+ </message>
+ <message>
+ <source>%1: Socket operation timed out</source>
+ <translation>%1：Socket 操作逾时</translation>
+ </message>
+ <message>
+ <source>%1: Datagram too large</source>
+ <translation>%1：数据报过大</translation>
+ </message>
+ <message>
+ <source>%1: Remote closed</source>
+ <translation>%1：远程已关闭</translation>
+ </message>
+</context>
+<context>
+ <name>QtXmlPatterns</name>
+ <message>
+ <source>A comment cannot contain %1</source>
+ <translation>批注不能包含 %1</translation>
+ </message>
+ <message>
+ <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
+ <translation>版本 %1 未支持。支持的 XQuery 版本为 1.0。</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>
+ </message>
+ <message>
+ <source>The parameter %1 is required, but no corresponding %2 is supplied.</source>
+ <translation>需要参数 %1，但是没有提供相关的 %2。</translation>
+ </message>
+ <message>
+ <source>Namespace declarations must occur before function, variable, and option declarations.</source>
+ <translation>命名空间宣告必须在函式、变量与选项宣告之前。</translation>
+ </message>
+ <message>
+ <source>empty</source>
+ <translation>空白</translation>
+ </message>
+ <message>
+ <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
+ <translation>要与前置字符串 %1 结合的命名空间网址不能是空字符串。</translation>
+ </message>
+ <message>
+ <source>A comment cannot end with a %1.</source>
+ <translation>批注不能以 %1 做结尾。</translation>
+ </message>
+ <message>
+ <source>Top level stylesheet elements must be in a non-null namespace, which %1 isn&apos;t.</source>
+ <translation>顶层样式表单元素必须是非空白的命名空间，而 %1 不是。</translation>
+ </message>
+ <message>
+ <source>Integer division (%1) by zero (%2) is undefined.</source>
+ <translation>整数除法 %1 零除（%2）的行为未定义。</translation>
+ </message>
+ <message>
+ <source>A library module cannot be evaluated directly. It must be imported from a main module.</source>
+ <translation>不能直接计算函式模块。必须要从主模块汇入。</translation>
+ </message>
+ <message>
+ <source>Time %1:%2:%3.%4 is invalid.</source>
+ <translation>时间 %1:%2:%3.%4 不合法。</translation>
+ </message>
+ <message>
+ <source>Attribute %1 cannot appear on the element %2. Only the standard attributes can appear.</source>
+ <translation>属性 %1 不能出现在元素 %2。只能有标准属性。</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>
+ </message>
+ <message>
+ <source>Modulus division (%1) by zero (%2) is undefined.</source>
+ <translation>余数除法 %1 零除（%2）的行为未定义。</translation>
+ </message>
+ <message>
+ <source>No function with signature %1 is available</source>
+ <translation>没有签章为 %1 的函式可使用</translation>
+ </message>
+ <message>
+ <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
+ <translation>未支援 pragma 叙述。因次，必须有默认的叙述</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>
+ </message>
+ <message>
+ <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
+ <translation>在 %2 内的代码点 %1（编码 %3）是一个不合法的 XML 字符。</translation>
+ </message>
+ <message>
+ <source>Network timeout.</source>
+ <translation>网络逾时。</translation>
+ </message>
+ <message>
+ <source>No casting is possible with %1 as the target type.</source>
+ <translation>不能转换到 %1 型态。</translation>
+ </message>
+ <message>
+ <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
+ <translation>机制汇入功能未支持，因此有 %1 个宣告无法达成。</translation>
+ </message>
+ <message>
+ <source>Attribute %1 and %2 are mutually exclusive.</source>
+ <translation>属性 %1 与 %2 彼此互斥。</translation>
+ </message>
+ <message>
+ <source>Parse error: %1</source>
+ <translation>剖析错误：%1</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>
+ </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>
+ </message>
+ <message>
+ <source>At least one component must be present.</source>
+ <translation>必须表达至少一个组件。</translation>
+ </message>
+ <message>
+ <source>In a namespace constructor, the value for a namespace value cannot be an empty string.</source>
+ <translation>在命名空间建构子中，命名空间的值不能是空字符串。</translation>
+ </message>
+ <message>
+ <source>An attribute by name %1 has already been created.</source>
+ <translation>名为 %1 的属性已被建立。</translation>
+ </message>
+ <message>
+ <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
+ <translation>名称为 %1 的参数已被宣告。每个参数名称必须唯一。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
+ <translation>%1 是正规表示式中不合法的旗标。合法的旗标有:</translation>
+ </message>
+ <message>
+ <source>At least one %1-element must occur inside %2.</source>
+ <translation>至少一个元素 %1 要出现在 %2 之内。</translation>
+ </message>
+ <message>
+ <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source>
+ <translation>只支援 Unicode Codepoint Collation（%1）。%2 未支援。</translation>
+ </message>
+ <message>
+ <source>Matches are case insensitive</source>
+ <translation>比对为区分大小写</translation>
+ </message>
+ <message>
+ <source>The name of an extension expression must be in a namespace.</source>
+ <translation>延伸叙述的名称必须在命名空间内。</translation>
+ </message>
+ <message>
+ <source>Each name of a template parameter must be unique; %1 is duplicated.</source>
+ <translation>每个样本参数的名称必须唯一；%1 已经被使用。</translation>
+ </message>
+ <message>
+ <source>At least one mode must be specified in the %1-attribute on element %2.</source>
+ <translation>在元素 %2 的 %1 属性中至少要指定一个模式。</translation>
+ </message>
+ <message>
+ <source>%1 matches newline characters</source>
+ <translation>%1 符合了换行字符</translation>
+ </message>
+ <message>
+ <source>Year %1 is invalid because it begins with %2.</source>
+ <translation>年份 %1 不合法，因为是从 %2 开始的。</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>
+ </message>
+ <message>
+ <source>Element %1 cannot have children.</source>
+ <translation>元素 %1 不能有子元素。</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>
+ </message>
+ <message>
+ <source>Only one %1-element can appear.</source>
+ <translation>只能出现一个元素 %1。</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>
+ </message>
+ <message>
+ <source>A positional predicate must evaluate to a single numeric value.</source>
+ <translation>位置谓词必须能计算出单一的数值。</translation>
+ </message>
+ <message>
+ <source>Element %1 can&apos;t be serialized because it appears outside the document element.</source>
+ <translation>元素 %1 无法串行化，因为似乎是在文文件元素之外。</translation>
+ </message>
+ <message>
+ <source>%1 and %2 match the start and end of a line.</source>
+ <translation>%1 与 %2 符合了一行的开始与结尾。</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>
+ </message>
+ <message>
+ <source>A stylesheet function must have a prefixed name.</source>
+ <translation>样式表单函式必须有前置名称。</translation>
+ </message>
+ <message>
+ <source>%1 cannot be retrieved</source>
+ <translation>%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>
+ </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>
+ </message>
+ <message>
+ <source>The prefix %1 cannot be bound.</source>
+ <translation>前置字符串 %1 不能被结合。</translation>
+ </message>
+ <message>
+ <source>The prefix must be a valid %1, which %2 is not.</source>
+ <translation>前置字符串必须是合法的 %1，但 %2 不是。</translation>
+ </message>
+ <message>
+ <source>The keyword %1 cannot occur with any other mode name.</source>
+ <translation>关键词 %1 不能与任何其它模式名称一起存在。</translation>
+ </message>
+ <message>
+ <source>Type error in cast, expected %1, received %2.</source>
+ <translation>转换型态错误，应为 %1 但接收到 %2。</translation>
+ </message>
+ <message>
+ <source>%1 is not a valid numeric literal.</source>
+ <translation>%1 不是合法的数值。</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>
+ <message>
+ <source>Circularity detected</source>
+ <translation>侦测到环状</translation>
+ </message>
+ <message>
+ <source>A variable by name %1 has already been declared.</source>
+ <translation>名为 %1 的变量已被宣告。</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>
+ </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>
+ </message>
+ <message>
+ <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
+ <translation>若元素 %1 没有属性 %2，则也不能有属性 %3 或 %4。</translation>
+ </message>
+ <message>
+ <source>A function already exists with the signature %1.</source>
+ <translation>已经有签章为 %1 的函式存在。</translation>
+ </message>
+ <message>
+ <source>When casting to %1 from %2, the source value cannot be %3.</source>
+ <translation>从 %2 转换型态为 %1 的时候，来源数值不能是 %3。</translation>
+ </message>
+ <message>
+ <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
+ <translation>属性元素 %1 无法串行化，因为似乎是在顶层。</translation>
+ </message>
+ <message>
+ <source>No comparisons can be done involving the type %1.</source>
+ <translation>包含型态 %1 时不能做比较。</translation>
+ </message>
+ <message>
+ <source>No value is available for the external variable by name %1.</source>
+ <translation>名为 %1 的外部变数没有可用的值。</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>
+ </message>
+ <message>
+ <source>The item %1 did not match the required type %2.</source>
+ <translation>项目 %1 未符合需要的型态 %2。</translation>
+ </message>
+ <message>
+ <source>Element %1 cannot have a sequence constructor.</source>
+ <translation>元素 %1不能有序列建构子。</translation>
+ </message>
+ <message>
+ <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
+ <translation>当属性 %1 出现在 %2 内时，不能使用序列建构子。</translation>
+ </message>
+ <message>
+ <source>one or more</source>
+ <translation>一个以上</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>
+ </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>
+ <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>
+ </message>
+ <message>
+ <source>The focus is undefined.</source>
+ <translation>焦点未定义。</translation>
+ </message>
+ <message>
+ <source>%1 is an unknown schema type.</source>
+ <translation>%1 是未知的机制型态。</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>
+ </message>
+ <message>
+ <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source>
+ <translation>在取代字符串中，在未脱逸的情形下 %1 必须至少跟着一位数字。</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>
+ </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>
+ </message>
+ <message>
+ <source>The first operand in an integer division, %1, cannot be infinity (%2).</source>
+ <translation>整数除法的第一个运算对象 %1 不能是无限大（%2）。</translation>
+ </message>
+ <message>
+ <source>%1 is not a valid value of type %2.</source>
+ <translation>%1 不是合法的 %2 型态的值。</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>
+ </message>
+ <message>
+ <source>The variable %1 is unused</source>
+ <translation>变量 %1 未使用</translation>
+ </message>
+ <message>
+ <source>The %1-axis is unsupported in XQuery</source>
+ <translation>XQuery 中未支援 %1 轴</translation>
+ </message>
+ <message>
+ <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
+ <translation>直接元素建构器没有完整产生。%1 以 %2 结束。</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>
+ </message>
+ <message>
+ <source>Attribute %1 cannot have the value %2.</source>
+ <translation>属性 %1 的值不能为 %2。</translation>
+ </message>
+ <message>
+ <source>It will not be possible to retrieve %1.</source>
+ <translation>无法取得 %1。</translation>
+ </message>
+ <message>
+ <source>In an XSL-T pattern, function %1 cannot have a third argument.</source>
+ <translation>在 XSL-T 样式内，函式 %1 的不能有第三个参数。</translation>
+ </message>
+ <message>
+ <source>The namespace URI in the name for a computed attribute cannot be %1.</source>
+ <translation>在已计算属性的名称的命名空间网址不能是 %1。</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>
+ </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>
+ </message>
+ <message>
+ <source>zero or one</source>
+ <translation>0 或 1 个</translation>
+ </message>
+ <message>
+ <source>No operand in an integer division, %1, can be %2.</source>
+ <translation>整数除法没有运作对象，%1，可以是 %2。</translation>
+ </message>
+ <message>
+ <source>The element with local name %1 does not exist in XSL-T.</source>
+ <translation>有本地名称 %1 的元素在 XSL-T 内不存在。</translation>
+ </message>
+ <message>
+ <source>Two namespace declaration attributes have the same name: %1.</source>
+ <translation>有两个命名空间宣告的属性有相同的名称：%1。</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>
+ </message>
+ <message>
+ <source>%1 is an invalid %2</source>
+ <translation>%1 是不合法的 %2</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>
+ </message>
+ <message>
+ <source>Division (%1) by zero (%2) is undefined.</source>
+ <translation>除法 %1 零除（%2）的行为未定义。</translation>
+ </message>
+ <message>
+ <source>No template by name %1 exists.</source>
+ <translation>没有名为 %1 的样本存在。</translation>
+ </message>
+ <message>
+ <source>The attribute %1 must appear on element %2.</source>
+ <translation>属性 %1 必须在元素 %2 内出现。</translation>
+ </message>
+ <message>
+ <source>An attribute by name %1 has already appeared on this element.</source>
+ <translation>名为 %1 的属性已出现在此元素。</translation>
+ </message>
+ <message>
+ <source>The default collection is undefined</source>
+ <translation>默认的收藏未定义</translation>
+ </message>
+ <message>
+ <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
+ <translation>只有前置字符串 %1 能与 %2 结合。反之亦然。</translation>
+ </message>
+ <message>
+ <source>Value %1 of type %2 exceeds maximum (%3).</source>
+ <translation>型态 %2 的数值 %1 已超过最大值（%3）。</translation>
+ </message>
+ <message>
+ <source>Whitespace characters are removed, except when they appear in character classes</source>
+ <translation>空格符已移除，除非它们出现在字符类别</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>
+ </message>
+ <message>
+ <source>Operator %1 cannot be used on type %2.</source>
+ <translation>操作元 %1 不能用于型态 %2。</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>
+ </message>
+ <message>
+ <source>The target namespace of a %1 cannot be empty.</source>
+ <translation>%1 的目标命名空间不能是空的。</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>
+ </message>
+ <message>
+ <source>%1 is an invalid namespace URI.</source>
+ <translation>%1 是不合法的命名空间网址。</translation>
+ </message>
+ <message>
+ <source>The attribute %1 cannot appear on %2, when it is a child of %3.</source>
+ <translation>属性 %1 不能出现在 %2，因为它是 %3 的子元素。</translation>
+ </message>
+ <message>
+ <source>The attribute %1 can only appear on the first %2 element.</source>
+ <translation>属性 %1 只能出现在前 %2 个元素内。</translation>
+ </message>
+ <message>
+ <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
+ <translation>元素 %1 必须至少有一个属性 %2 或一个序列建构子。</translation>
+ </message>
+ <message>
+ <source>Module imports must occur before function, variable, and option declarations.</source>
+ <translation>模块汇入必须在函式、变量与选项宣告之前。</translation>
+ </message>
+ <message>
+ <source>Day %1 is outside the range %2..%3.</source>
+ <translation>日期 %1 已超出 %2 到 %3 的范围。</translation>
+ </message>
+ <message>
+ <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
+ <translation>%1 包含了在要求的编码 %2 内不允许的八进制值。</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>
+ </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>
+ </message>
+ <message>
+ <source>Text nodes are not allowed at this location.</source>
+ <translation>文本节点不能在此位置。</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>
+ </message>
+ <message>
+ <source>%1 is not a valid name for a processing-instruction.</source>
+ <translation>%1 不是处理指令的合法名称。</translation>
+ </message>
+ <message>
+ <source>%1 was called.</source>
+ <translation>%1 已被呼叫。</translation>
+ </message>
+ <message>
+ <source>It&apos;s not possible to add attributes after any other kind of node.</source>
+ <translation>不能在&apos;任何其它种类的节点后面加入属性。</translation>
+ </message>
+ <message>
+ <source>At least one %1-element must occur before %2.</source>
+ <translation>至少一个元素 %1 要出现在 %2 之前。</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>
+ </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>
+ </message>
+ <message>
+ <source>A parameter in a function cannot be declared to be a tunnel.</source>
+ <translation>函式内的参数不能被宣告为通道（tunnel）。</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>
+ </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>
+ </message>
+ <message>
+ <source>Day %1 is invalid for month %2.</source>
+ <translation>月份 %2 中没有日期 %1。</translation>
+ </message>
+ <message>
+ <source>Overflow: Can&apos;t represent date %1.</source>
+ <translation>溢位：无法&apos;表示日期 %1。</translation>
+ </message>
+ <message>
+ <source>In a simplified stylesheet module, attribute %1 must be present.</source>
+ <translation>在简化的样式表单模块中，属性 %1 必须存在。</translation>
+ </message>
+ <message>
+ <source>Unknown XSL-T attribute %1.</source>
+ <translation>未知的 XSL-T 属性 %1。</translation>
+ </message>
+ <message>
+ <source>It is not possible to redeclare prefix %1.</source>
+ <translation>无法重宣告前置字符串 %1。</translation>
+ </message>
+ <message>
+ <source>exactly one</source>
+ <translation>刚好一个</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid regular expression pattern: %2</source>
+ <translation>%1 是不合法的正规表示式样式：%2</translation>
+ </message>
+ <message>
+ <source>Element %1 is not allowed at this location.</source>
+ <translation>元素 %1 不能在此位置。</translation>
+ </message>
+ <message>
+ <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
+ <translation>未支持机制确认功能。%1 叙述无法使用。</translation>
+ </message>
+ <message>
+ <source>At least one %1 element must appear as child of %2.</source>
+ <translation>%2 必须至少有一个子元素 %1。</translation>
+ </message>
+ <message>
+ <source>This processor is not Schema-aware and therefore %1 cannot be used.</source>
+ <translation>此处理器不是 Schema-aware，因此不能使用 %1。</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>
+ </message>
+ <message>
+ <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source>
+ <translation>将型态 %1 除以 %2（非数值）是不允许的。</translation>
+ </message>
+ <message>
+ <source>Required cardinality is %1; got cardinality %2.</source>
+ <translation>需要的基数为 %1；得到的是 %2。</translation>
+ </message>
+ <message>
+ <source>A construct was encountered which only is allowed in XQuery.</source>
+ <translation>遇到了建构，实际上只能允许在 XQuery 内。</translation>
+ </message>
+ <message>
+ <source>No function by name %1 is available.</source>
+ <translation>没有名为 %1 的函式。</translation>
+ </message>
+ <message>
+ <source>The URI cannot have a fragment</source>
+ <translation>URI 不能有片段</translation>
+ </message>
+ <message>
+ <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
+ <translation>%1 不是一个原型态。只能转换为原型态。</translation>
+ </message>
+ <message>
+ <source>The first argument to %1 cannot be of type %2.</source>
+ <translation>呼叫 %1 的第一个参数不能是 %2 型态。</translation>
+ </message>
+ <message>
+ <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
+ <translation>命名空间网址必须是常数，并且不能使用封闭叙述。</translation>
+ </message>
+ <message>
+ <source>Prefix %1 is already declared in the prolog.</source>
+ <translation>前置字符串 %1 已在 prolog 中宣告。</translation>
+ </message>
+ <message>
+ <source>Ambiguous rule match.</source>
+ <translation>不明确的规则符合。</translation>
+ </message>
+ <message>
+ <source>Promoting %1 to %2 may cause loss of precision.</source>
+ <translation>将 %1 抬升为 %2 可能会失去精确度。</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>
+ </message>
+ <message>
+ <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
+ <translation>默认的命名空间宣告必须在函式、变量与选项宣告之前。</translation>
+ </message>
+ <message>
+ <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
+ <translation>操作元 %1 不能用于型态 %2 与 %3 的原数值。</translation>
+ </message>
+ <message>
+ <source>The module import feature is not supported</source>
+ <translation>模块汇入功能未支持</translation>
+ </message>
+ <message>
+ <source>The parameter %1 is passed, but no corresponding %2 exists.</source>
+ <translation>参数 %1 已传送，但找不到相关的 %2。</translation>
+ </message>
+ <message>
+ <source>A value of type %1 cannot have an Effective Boolean Value.</source>
+ <translation>型态 %1 不能有实际布尔值。</translation>
+ </message>
+ <message>
+ <source>The data of a processing instruction cannot contain the string %1</source>
+ <translation>处理指令的数据不能包含字符串 %1</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>
+ </message>
+ <message>
+ <source>A template by name %1 has already been declared.</source>
+ <translation>名为 %1 的属性已被宣告。</translation>
+ </message>
+ <message>
+ <source>It is not possible to bind to the prefix %1</source>
+ <translation>无法与前置字符串 %1 结合</translation>
+ </message>
+ <message>
+ <source>Value %1 of type %2 is below minimum (%3).</source>
+ <translation>型态 %2 的数值 %1 已低过最小值（%3）。</translation>
+ </message>
+ <message>
+ <source>Required type is %1, but %2 was found.</source>
+ <translation>需要的型态为 %1，但找到 %2。</translation>
+ </message>
+ <message>
+ <source>%1 is an unsupported encoding.</source>
+ <translation>%1 是个未被支持的编码。</translation>
+ </message>
+ <message>
+ <source>The name of an option must have a prefix. There is no default namespace for options.</source>
+ <translation>选项名称必须有前置字符串。没有选项的默认命名空间。</translation>
+ </message>
+ <message>
+ <source>Element %1 must come last.</source>
+ <translation>元素 %1 必须最后出现。</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>
+ </message>
+ <message>
+ <source>No namespace binding exists for the prefix %1 in %2</source>
+ <translation>在 %2 的前置字符串 %1 没有结合命名空间</translation>
+ </message>
+ <message>
+ <source>The name %1 does not refer to any schema type.</source>
+ <translation>名称 %1 未指向任何机制型态。</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>
+ </message>
+ <message>
+ <source>The initialization of variable %1 depends on itself</source>
+ <translation>变数 %1 的初始化与自身相依</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>
+ </message>
+ <message>
+ <source>Month %1 is outside the range %2..%3.</source>
+ <translation>月份 %1 已超出 %2 到 %3 的范围。</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>
+ </message>
+ <message>
+ <source>No namespace binding exists for the prefix %1</source>
+ <translation>前置字符串 %1 没有结合命名空间</translation>
+ </message>
+ <message>
+ <source>An %1-attribute with value %2 has already been declared.</source>
+ <translation>已宣告属性 %1 的值为 %2。</translation>
+ </message>
+ <message>
+ <source>%1 is not valid as a value of type %2.</source>
+ <translation>%1 不是合法的 %2 型态的值。</translation>
+ </message>
+ <message>
+ <source>zero or more</source>
+ <translation>0 个以上</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>
+ </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>
+ </message>
+ <message>
+ <source>%1 is an invalid template mode name.</source>
+ <translation>%1 不是合法的样本模式名称。</translation>
+ </message>
+ <message>
+ <source>At least one time component must appear after the %1-delimiter.</source>
+ <translation>在分隔符 %1 后必须至少有一个时间组件。</translation>
+ </message>
+ <message>
+ <source>Overflow: Date can&apos;t be represented.</source>
+ <translation>溢位：无法&apos;表示日期。</translation>
+ </message>
+ <message>
+ <source>Operator %1 is not available between atomic values of type %2 and %3.</source>
+ <translation>操作元 %1 不能用于型态 %2 与 %3 的原数值。</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>
+ </message>
+ <message>
+ <source>%1 is not a valid XML 1.0 character.</source>
+ <translation>%1 不是合法的 XML 1.0 字符。</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>
+ </message>
+ <message>
+ <source>%1 is not a whole number of minutes.</source>
+ <translation>%1 不是分钟的数值。</translation>
+ </message>
+ <message>
+ <source>Failure when casting from %1 to %2: %3</source>
+ <translation>从 %1 转换到 %2 时失败：%3</translation>
+ </message>
+ <message>
+ <source>It is not possible to cast from %1 to %2.</source>
+ <translation>不能从 %1 转换到 %2。</translation>
+ </message>
+ <message>
+ <source>No variable by name %1 exists</source>
+ <translation>没有名为 %1 的变量存在</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>
+ </message>
+ <message>
+ <source>The second operand in a division, %1, cannot be zero (%2).</source>
+ <translation>整数除法的第二个运算对象 %1 不能是零（%2）。</translation>
+ </message>
+ <message>
+ <source>Only one %1 declaration can occur in the query prolog.</source>
+ <translation>只有一个 %1 宣告可以在查询中。</translation>
+ </message>
+ <message>
+ <source>Element %1 must have at least one of the attributes %2 or %3.</source>
+ <translation>元素 %1 必须至少有属性 %2 或 %3 其中一个。</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>
+ </message>
+ <message>
+ <source>No external functions are supported. All supported functions can be used directly, without first declaring them as external</source>
+ <translation>未支持外部函式。所有支持的含式可以直接使用而不需要先宣告为外部函式</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>
+ </message>
+</context>
+<context>
+ <name>QFontDialog</name>
+ <message>
+ <source>&amp;Font</source>
+ <translation>&amp;字型</translation>
+ </message>
+ <message>
+ <source>&amp;Size</source>
+ <translation>&amp;大小</translation>
+ </message>
+ <message>
+ <source>Sample</source>
+ <translation>范例</translation>
+ </message>
+ <message>
+ <source>Font st&amp;yle</source>
+ <translation>字型样&amp;式</translation>
+ </message>
+ <message>
+ <source>Wr&amp;iting System</source>
+ <translation>写&amp;入系统</translation>
+ </message>
+ <message>
+ <source>Select Font</source>
+ <translation>选择字型</translation>
+ </message>
+ <message>
+ <source>&amp;Underline</source>
+ <translation>&amp;底线</translation>
+ </message>
+ <message>
+ <source>Effects</source>
+ <translation>效果</translation>
+ </message>
+ <message>
+ <source>Stri&amp;keout</source>
+ <translation>删&amp;除线</translation>
+ </message>
+</context>
+<context>
+ <name>Q3Wizard</name>
+ <message>
+ <source>&amp;Help</source>
+ <translation>&amp;说明</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;取消</translation>
+ </message>
+ <message>
+ <source>&amp;Finish</source>
+ <translation>&amp;完成</translation>
+ </message>
+ <message>
+ <source>&amp;Next &gt;</source>
+ <translation>&amp;下一个 &gt;＞</translation>
+ </message>
+ <message>
+ <source>&lt; &amp;Back</source>
+ <translation>＜&lt; &amp;返回</translation>
+ </message>
+</context>
+<context>
+ <name>QWorkspace</name>
+ <message>
+ <source>&amp;Move</source>
+ <translation>&amp;移动</translation>
+ </message>
+ <message>
+ <source>&amp;Size</source>
+ <translation>&amp;大小</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>Minimize</source>
+ <translation>最小化</translation>
+ </message>
+ <message>
+ <source>Stay on &amp;Top</source>
+ <translation>留在&amp;顶端</translation>
+ </message>
+ <message>
+ <source>&amp;Close</source>
+ <translation>&amp;关闭</translation>
+ </message>
+ <message>
+ <source>%1 - [%2]</source>
+ <translation>%1 - [%2]</translation>
+ </message>
+ <message>
+ <source>Sh&amp;ade</source>
+ <translation>遮&amp;蔽)</translation>
+ </message>
+ <message>
+ <source>&amp;Restore</source>
+ <translation>&amp;回复</translation>
+ </message>
+ <message>
+ <source>&amp;Unshade</source>
+ <translation>&amp;取消遮蔽</translation>
+ </message>
+ <message>
+ <source>Mi&amp;nimize</source>
+ <translation>最小&amp;化</translation>
+ </message>
+ <message>
+ <source>Ma&amp;ximize</source>
+ <translation>最大&amp;化</translation>
+ </message>
+ <message>
+ <source>Restore Down</source>
+ <translation>向下恢复</translation>
+ </message>
+</context>
+<context>
+ <name>QColorDialog</name>
+ <message>
+ <source>&amp;Red:</source>
+ <translation>&amp;红:</translation>
+ </message>
+ <message>
+ <source>&amp;Sat:</source>
+ <translation>&amp;饱和度:</translation>
+ </message>
+ <message>
+ <source>&amp;Val:</source>
+ <translation>&amp;亮度:</translation>
+ </message>
+ <message>
+ <source>Hu&amp;e:</source>
+ <translation>色&amp;调:</translation>
+ </message>
+ <message>
+ <source>Select Color</source>
+ <translation>选择颜色</translation>
+ </message>
+ <message>
+ <source>&amp;Add to Custom Colors</source>
+ <translation>&amp;新增到自定义颜色</translation>
+ </message>
+ <message>
+ <source>Bl&amp;ue:</source>
+ <translation>蓝&amp;色):</translation>
+ </message>
+ <message>
+ <source>&amp;Green:</source>
+ <translation>绿&amp;色):</translation>
+ </message>
+ <message>
+ <source>&amp;Basic colors</source>
+ <translation>&amp;基本颜色</translation>
+ </message>
+ <message>
+ <source>&amp;Custom colors</source>
+ <translation>&amp;自定义颜色</translation>
+ </message>
+ <message>
+ <source>A&amp;lpha channel:</source>
+ <translation>&amp;Alpha 色版:</translation>
+ </message>
+</context>
+<context>
+ <name>QSharedMemory</name>
+ <message>
+ <source>%1: system-imposed size restrictions</source>
+ <translation>%1：系统大小限制</translation>
+ </message>
+ <message>
+ <source>%1: unix key file doesn&apos;t exists</source>
+ <translation>%1：unix 键值档不&apos;存在</translation>
+ </message>
+ <message>
+ <source>%1: doesn&apos;t exists</source>
+ <translation>%1：不&apos;存在</translation>
+ </message>
+ <message>
+ <source>%1: key is empty</source>
+ <translation>%1：键值是空的</translation>
+ </message>
+ <message>
+ <source>%1: key error</source>
+ <translation>%1：键值错误</translation>
+ </message>
+ <message>
+ <source>%1: create size is less then 0</source>
+ <translation>%1：建立大小小于 0</translation>
+ </message>
+ <message>
+ <source>%1: already exists</source>
+ <translation>%1：已存在</translation>
+ </message>
+ <message>
+ <source>%1: unknown error %2</source>
+ <translation>%1：未知的错误 %2</translation>
+ </message>
+ <message>
+ <source>%1: invalid size</source>
+ <translation>%1：不合法的大小</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>
+ </message>
+ <message>
+ <source>%1: unable to unlock</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>
+ </message>
+ <message>
+ <source>%1: out of resources</source>
+ <translation>%1：资源不足</translation>
+ </message>
+ <message>
+ <source>%1: not attached</source>
+ <translation>%1：未附加</translation>
+ </message>
+ <message>
+ <source>%1: size query failed</source>
+ <translation>%1：大小查询失败</translation>
+ </message>
+ <message>
+ <source>%1: unable to lock</source>
+ <translation>%1：无法锁定</translation>
+ </message>
+</context>
+<context>
+ <name>QXmlStream</name>
+ <message>
+ <source>Reference to unparsed entity &apos;%1&apos;.</source>
+ <translation>参考到未剖析的实体 &apos;%1&apos;1。</translation>
+ </message>
+ <message>
+ <source>Unexpected character &apos;%1&apos; in public id literal.</source>
+ <translation>在公开代码字符中&apos;%1&apos;遇到非预期的字符 %1。</translation>
+ </message>
+ <message>
+ <source>Illegal namespace declaration.</source>
+ <translation>不合法的命名空间宣告。</translation>
+ </message>
+ <message>
+ <source>Invalid XML character.</source>
+ <translation>不合法的 XML 字符。</translation>
+ </message>
+ <message>
+ <source>Expected character data.</source>
+ <translation>预期的字符数据。</translation>
+ </message>
+ <message>
+ <source>Standalone accepts only yes or no.</source>
+ <translation>独立实体只接受 yes 或 no。</translation>
+ </message>
+ <message>
+ <source>Invalid XML version string.</source>
+ <translation>不合法的 XML 版本字符串。</translation>
+ </message>
+ <message>
+ <source>Invalid processing instruction name.</source>
+ <translation>不合法的处理指令名称。</translation>
+ </message>
+ <message>
+ <source>Namespace prefix &apos;%1&apos; not declared</source>
+ <translation>命名空间的前置字符串&apos;%1&apos;未宣告</translation>
+ </message>
+ <message>
+ <source>Entity &apos;%1&apos; not declared.</source>
+ <translation>实体 %1 &apos;%1&apos;未宣告。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid processing instruction name.</source>
+ <translation>%1 是不合法的处理指令名称。</translation>
+ </message>
+ <message>
+ <source>The standalone pseudo attribute must appear after the encoding.</source>
+ <translation>独立的虚拟属性必须在编码之后出现。</translation>
+ </message>
+ <message>
+ <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
+ <translation>在内文中&apos;]]&gt;&apos;不允许有序列。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid encoding name.</source>
+ <translation>%1 为不合法的编码名称。</translation>
+ </message>
+ <message>
+ <source>, but got &apos;</source>
+ <translation>，但是看到的是 &apos;</translation>
+ </message>
+ <message>
+ <source>Start tag expected.</source>
+ <translation>预期应有开始标签。</translation>
+ </message>
+ <message>
+ <source>Invalid character reference.</source>
+ <translation>不合法的字符参考。</translation>
+ </message>
+ <message>
+ <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
+ <translation>在属性值中 &apos;%1&apos;参考到外部实体 %1。</translation>
+ </message>
+ <message>
+ <source>Expected </source>
+ <translation>预期应为 </translation>
+ </message>
+ <message>
+ <source>Invalid document.</source>
+ <translation>不合法的文檔。</translation>
+ </message>
+ <message>
+ <source>Opening and ending tag mismatch.</source>
+ <translation>开启与结束的标签不对称。</translation>
+ </message>
+ <message>
+ <source>Encountered incorrectly encoded content.</source>
+ <translation>遇到不正确的编码内容。</translation>
+ </message>
+ <message>
+ <source>Invalid attribute in XML declaration.</source>
+ <translation>XML 宣告中有不合法的属性。</translation>
+ </message>
+ <message>
+ <source>Attribute redefined.</source>
+ <translation>属性重定义。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid PUBLIC identifier.</source>
+ <translation>%1 为不合法的 PUBLIC 识别子。</translation>
+ </message>
+ <message>
+ <source>Extra content at end of document.</source>
+ <translation>文檔尾端有多余的内容。</translation>
+ </message>
+ <message>
+ <source>Invalid XML name.</source>
+ <translation>不合法的 XML 名称。</translation>
+ </message>
+ <message>
+ <source>Premature end of document.</source>
+ <translation>文檔结尾不正确。</translation>
+ </message>
+ <message>
+ <source>XML declaration not at start of document.</source>
+ <translation>XML 宣告没有在文檔开始处。</translation>
+ </message>
+ <message>
+ <source>Recursive entity detected.</source>
+ <translation>侦测到递归实体。</translation>
+ </message>
+ <message>
+ <source>Unsupported XML version.</source>
+ <translation>未支持的 XML 版本。</translation>
+ </message>
+ <message>
+ <source>Unexpected &apos;</source>
+ <translation>非预期 &apos;</translation>
+ </message>
+ <message>
+ <source>Invalid entity value.</source>
+ <translation>不合法的实体值。</translation>
+ </message>
+ <message>
+ <source>Encoding %1 is unsupported</source>
+ <translation>编码 %1 不支持</translation>
+ </message>
+ <message>
+ <source>NDATA in parameter entity declaration.</source>
+ <translation>在参数实体宣告有 NDATA。</translation>
+ </message>
+</context>
+<context>
+ <name>QProcess</name>
+ <message>
+ <source>Error writing to process</source>
+ <translation>写入行程时发生错误</translation>
+ </message>
+ <message>
+ <source>Resource error (fork failure): %1</source>
+ <translation>资源错误（fork 失败）：%1</translation>
+ </message>
+ <message>
+ <source>Error reading from process</source>
+ <translation>从行程读取时发生错误</translation>
+ </message>
+ <message>
+ <source>Process failed to start</source>
+ <translation>启动行程失败</translation>
+ </message>
+ <message>
+ <source>Could not open input redirection for reading</source>
+ <translation>无法开启输入导向以读取</translation>
+ </message>
+ <message>
+ <source>Could not open output redirection for writing</source>
+ <translation>无法开启输出导向以写入</translation>
+ </message>
+ <message>
+ <source>Process operation timed out</source>
+ <translation>行程操作逾时</translation>
+ </message>
+ <message>
+ <source>Process crashed</source>
+ <translation>行程已崩溃</translation>
+ </message>
+</context>
+<context>
+ <name>QNativeSocketEngine</name>
+ <message>
+ <source>The proxy type is invalid for this operation</source>
+ <translation>代理服务器型态无法支持此操作</translation>
+ </message>
+ <message>
+ <source>Network operation timed out</source>
+ <translation>网络操作逾时</translation>
+ </message>
+ <message>
+ <source>The remote host closed the connection</source>
+ <translation>远程主机关闭了联机</translation>
+ </message>
+ <message>
+ <source>Invalid socket descriptor</source>
+ <translation>不合法的 socket 描述子</translation>
+ </message>
+ <message>
+ <source>Host unreachable</source>
+ <translation>无法联机到主机</translation>
+ </message>
+ <message>
+ <source>Protocol type not supported</source>
+ <translation>协议型态未支持</translation>
+ </message>
+ <message>
+ <source>Datagram was too large to send</source>
+ <translation>数据过大无法送出</translation>
+ </message>
+ <message>
+ <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
+ <translation>试图在没有 IPv6 支持的平台上使用 IPv6 socket</translation>
+ </message>
+ <message>
+ <source>Unable to receive a message</source>
+ <translation>无法接收讯息</translation>
+ </message>
+ <message>
+ <source>Permission denied</source>
+ <translation>权限不足</translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation>联机被拒</translation>
+ </message>
+ <message>
+ <source>Unable to write</source>
+ <translation>无法写入</translation>
+ </message>
+ <message>
+ <source>Another socket is already listening on the same port</source>
+ <translation>另一个 socket 已经在监听同一个端口</translation>
+ </message>
+ <message>
+ <source>Unable to send a message</source>
+ <translation>无法送出讯息</translation>
+ </message>
+ <message>
+ <source>The bound address is already in use</source>
+ <translation>结合的地址已经在使用中</translation>
+ </message>
+ <message>
+ <source>Connection timed out</source>
+ <translation>联机逾时</translation>
+ </message>
+ <message>
+ <source>Network error</source>
+ <translation>网络错误</translation>
+ </message>
+ <message>
+ <source>Unsupported socket operation</source>
+ <translation>未支持的 socket 操作</translation>
+ </message>
+ <message>
+ <source>Operation on non-socket</source>
+ <translation>对非 socket 操作</translation>
+ </message>
+ <message>
+ <source>Unable to initialize broadcast socket</source>
+ <translation>无法初始化广播 socket</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的错误</translation>
+ </message>
+ <message>
+ <source>Unable to initialize non-blocking socket</source>
+ <translation>无法初始化非阻挡性 socket</translation>
+ </message>
+ <message>
+ <source>The address is protected</source>
+ <translation>此地址已被保护</translation>
+ </message>
+ <message>
+ <source>Network unreachable</source>
+ <translation>无法使用网络</translation>
+ </message>
+ <message>
+ <source>The address is not available</source>
+ <translation>无法取得地址</translation>
+ </message>
+ <message>
+ <source>Out of resources</source>
+ <translation>资源不足</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessFtpBackend</name>
+ <message>
+ <source>No suitable proxy found</source>
+ <translation>找不到合适的代理服务器</translation>
+ </message>
+ <message>
+ <source>Error while downloading %1: %2</source>
+ <translation>下载 %1 时发生错误：%2</translation>
+ </message>
+ <message>
+ <source>Error while uploading %1: %2</source>
+ <translation>上传 %1 时发生错误：%2</translation>
+ </message>
+ <message>
+ <source>Cannot open %1: is a directory</source>
+ <translation>无法开启 %1：是一个目录</translation>
+ </message>
+ <message>
+ <source>Logging in to %1 failed: authentication required</source>
+ <translation>登入 %1 失败：需要认证</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessHttpBackend</name>
+ <message>
+ <source>No suitable proxy found</source>
+ <translation>找不到合适的代理服务器</translation>
+ </message>
+</context>
+<context>
+ <name>QCheckBox</name>
+ <message>
+ <source>Check</source>
+ <translation>勾选</translation>
+ </message>
+ <message>
+ <source>Toggle</source>
+ <translation>切换</translation>
+ </message>
+ <message>
+ <source>Uncheck</source>
+ <translation>取消勾选</translation>
+ </message>
+</context>
+<context>
+ <name>QRadioButton</name>
+ <message>
+ <source>Check</source>
+ <translation>勾选</translation>
+ </message>
+</context>
+<context>
+ <name>Q3TitleBar</name>
+ <message>
+ <source>Close</source>
+ <translation>关闭</translation>
+ </message>
+ <message>
+ <source>Minimize</source>
+ <translation>最小化</translation>
+ </message>
+ <message>
+ <source>Puts a minimized back to normal</source>
+ <translation>将最小化窗口放回原大小</translation>
+ </message>
+ <message>
+ <source>Displays the name of the window and contains controls to manipulate it</source>
+ <translation>显示窗口名称，并包含操作它的控制组件</translation>
+ </message>
+ <message>
+ <source>Makes the window full screen</source>
+ <translation>将窗口放大到全画面</translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation>系统</translation>
+ </message>
+ <message>
+ <source>Maximize</source>
+ <translation>最大化</translation>
+ </message>
+ <message>
+ <source>Contains commands to manipulate the window</source>
+ <translation>包含要操作此窗口的指令</translation>
+ </message>
+ <message>
+ <source>Restore up</source>
+ <translation>向上恢复</translation>
+ </message>
+ <message>
+ <source>Closes the window</source>
+ <translation>关闭窗口</translation>
+ </message>
+ <message>
+ <source>Puts a maximized window back to normal</source>
+ <translation>将最大化窗口放回原大小</translation>
+ </message>
+ <message>
+ <source>Moves the window out of the way</source>
+ <translation>把窗口移开</translation>
+ </message>
+ <message>
+ <source>Restore down</source>
+ <translation>向下恢复</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::</name>
+ <message>
+ <source>Games</source>
+ <translation>游戏</translation>
+ </message>
+ <message>
+ <source>Music</source>
+ <translation>音乐</translation>
+ </message>
+ <message>
+ <source>Video</source>
+ <translation>影像</translation>
+ </message>
+ <message>
+ <source>Communication</source>
+ <translation>通讯</translation>
+ </message>
+ <message>
+ <source>Accessibility</source>
+ <translation>辅助装置</translation>
+ </message>
+ <message>
+ <source>Notifications</source>
+ <translation>通知</translation>
+ </message>
+</context>
+<context>
+ <name>VolumeSlider</name>
+ <message>
+ <source>Muted</source>
+ <translation>静音</translation>
+ </message>
+ <message>
+ <source>Volume: %1%</source>
+ <translation>音量：%1%</translation>
+ </message>
+</context>
+<context>
+ <name>Q3LocalFs</name>
+ <message>
+ <source>Could not open
+%1</source>
+ <translation>无法开启
+%1</translation>
+ </message>
+ <message>
+ <source>Could not remove file or directory
+%1</source>
+ <translation>无法移除目录
+%1</translation>
+ </message>
+ <message>
+ <source>Could not create directory
+%1</source>
+ <translation>无法建立目录
+%1</translation>
+ </message>
+ <message>
+ <source>Could not read directory
+%1</source>
+ <translation>无法读取目录
+%1</translation>
+ </message>
+ <message>
+ <source>Could not rename
+%1
+to
+%2</source>
+ <translation>无法将
+%1
+重新命名为
+%2</translation>
+ </message>
+ <message>
+ <source>Could not write
+%1</source>
+ <translation>无法写入
+%1</translation>
+ </message>
+</context>
+<context>
+ <name>QDial</name>
+ <message>
+ <source>QDial</source>
+ <translation>QDial</translation>
+ </message>
+ <message>
+ <source>SliderHandle</source>
+ <translation>SliderHandle</translation>
+ </message>
+ <message>
+ <source>SpeedoMeter</source>
+ <translation>SpeedoMeter</translation>
+ </message>
+</context>
+<context>
+ <name>QSocks5SocketEngine</name>
+ <message>
+ <source>Network operation timed out</source>
+ <translation>网络操作逾时</translation>
+ </message>
+ <message>
+ <source>Connection to proxy closed prematurely</source>
+ <translation>代理服务器联机已不正常关闭</translation>
+ </message>
+ <message>
+ <source>Proxy authentication failed: %1</source>
+ <translation>代理服务器认证失败：%1</translation>
+ </message>
+ <message>
+ <source>Proxy authentication failed</source>
+ <translation>代理服务器认证失败</translation>
+ </message>
+ <message>
+ <source>General SOCKSv5 server failure</source>
+ <translation>一般的 SOCKSv5 服务器错误</translation>
+ </message>
+ <message>
+ <source>Unknown SOCKSv5 proxy error code 0x%1</source>
+ <translation>未知的 SOCKSv5 代理服务器错误代码 0x%1</translation>
+ </message>
+ <message>
+ <source>Connection not allowed by SOCKSv5 server</source>
+ <translation>联机未被 SOCKSv5 服务器允许</translation>
+ </message>
+ <message>
+ <source>SOCKSv5 command not supported</source>
+ <translation>SOCKSv5 指令未被支持</translation>
+ </message>
+ <message>
+ <source>Connection to proxy timed out</source>
+ <translation>代理服务器联机逾时</translation>
+ </message>
+ <message>
+ <source>Proxy host not found</source>
+ <translation>找不到代理服务器</translation>
+ </message>
+ <message>
+ <source>TTL expired</source>
+ <translation>TTL 逾时</translation>
+ </message>
+ <message>
+ <source>Address type not supported</source>
+ <translation>地址型态未被支持</translation>
+ </message>
+ <message>
+ <source>Connection to proxy refused</source>
+ <translation>代理服务器联机被拒</translation>
+ </message>
+ <message>
+ <source>SOCKS version 5 protocol error</source>
+ <translation>SOCKS 5 的协议错误</translation>
+ </message>
+</context>
+<context>
+ <name>QWhatsThisAction</name>
+ <message>
+ <source>What&apos;s This?</source>
+ <translation>这是&apos;什么?</translation>
+ </message>
+</context>
+<context>
+ <name>Q3UrlOperator</name>
+ <message>
+ <source>The protocol `%1&apos; does not support getting files</source>
+ <translation>协定 %1&apos; 未支持取得文件</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support renaming files or directories</source>
+ <translation>协定 %1&apos; 未支持重新命名文件或目录</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support listing directories</source>
+ <translation>协定 %1&apos; 未支持列出目录</translation>
+ </message>
+ <message>
+ <source>(unknown)</source>
+ <translation>（未知）</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support removing files or directories</source>
+ <translation>协定 %1&apos; 未支持移除文件或目录</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support putting files</source>
+ <translation>协定 %1&apos; 未支持写入文件</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; is not supported</source>
+ <translation>协议 %1 未支持</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support copying or moving files or directories</source>
+ <translation>协议 %1 未支持复制或移动文件或目录</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support creating new directories</source>
+ <translation>协议 %1 未支持建立新目录</translation>
+ </message>
+</context>
+<context>
+ <name>QFtp</name>
+ <message>
+ <source>Listing directory failed:
+%1</source>
+ <translation>列出目录时失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Creating directory failed:
+%1</source>
+ <translation>建立目录时失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Not connected</source>
+ <translation>未联机</translation>
+ </message>
+ <message>
+ <source>Connection refused for data connection</source>
+ <translation>数据联机被拒</translation>
+ </message>
+ <message>
+ <source>Login failed:
+%1</source>
+ <translation>登入失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Downloading file failed:
+%1</source>
+ <translation>下载文件时失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Connected to host</source>
+ <translation>已联机到主机</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>Connecting to host failed:
+%1</source>
+ <translation>联机到主机失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Host %1 not found</source>
+ <translation>找不到主机 %1</translation>
+ </message>
+ <message>
+ <source>Uploading file failed:
+%1</source>
+ <translation>上传文件时失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Changing directory failed:
+%1</source>
+ <translation>变更目录时失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Host found</source>
+ <translation>找到主机</translation>
+ </message>
+ <message>
+ <source>Removing directory failed:
+%1</source>
+ <translation>移除目录时失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Connection refused to host %1</source>
+ <translation>联机到主机 %1 被拒</translation>
+ </message>
+ <message>
+ <source>Connection to %1 closed</source>
+ <translation>到 %1 的联机已关闭</translation>
+ </message>
+ <message>
+ <source>Removing file failed:
+%1</source>
+ <translation>移除文件时失败：
+%1</translation>
+ </message>
+ <message>
+ <source>Host %1 found</source>
+ <translation>找到主机 %1</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的错误</translation>
+ </message>
+ <message>
+ <source>Connection closed</source>
+ <translation>联机已关闭</translation>
+ </message>
+</context>
+<context>
+ <name>QDB2Driver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Unable to set autocommit</source>
+ <translation>无法设置自动提交</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>无法连接</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+</context>
+<context>
+ <name>QIBaseDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Could not start transaction</source>
+ <translation>无法开始事务</translation>
+ </message>
+ <message>
+ <source>Error opening database</source>
+ <translation>开启数据库发生错误</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+</context>
+<context>
+ <name>QIBaseResult</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Unable to open BLOB</source>
+ <translation>无法开启 BLOB</translation>
+ </message>
+ <message>
+ <source>Could not describe statement</source>
+ <translation>无法描述叙述</translation>
+ </message>
+ <message>
+ <source>Could not describe input statement</source>
+ <translation>无法描述输入叙述</translation>
+ </message>
+ <message>
+ <source>Could not allocate statement</source>
+ <translation>无法配置叙述</translation>
+ </message>
+ <message>
+ <source>Unable to write BLOB</source>
+ <translation>无法写入 BLOB</translation>
+ </message>
+ <message>
+ <source>Could not start transaction</source>
+ <translation>无法开始事务</translation>
+ </message>
+ <message>
+ <source>Unable to close statement</source>
+ <translation>无法关闭叙述</translation>
+ </message>
+ <message>
+ <source>Could not get query info</source>
+ <translation>无法取得查询信息</translation>
+ </message>
+ <message>
+ <source>Could not find array</source>
+ <translation>找不到数组</translation>
+ </message>
+ <message>
+ <source>Could not get array data</source>
+ <translation>无法取得数组数据</translation>
+ </message>
+ <message>
+ <source>Unable to execute query</source>
+ <translation>无法执行查询</translation>
+ </message>
+ <message>
+ <source>Could not prepare statement</source>
+ <translation>无法准备叙述</translation>
+ </message>
+ <message>
+ <source>Could not fetch next item</source>
+ <translation>无法抓取下一个项目</translation>
+ </message>
+ <message>
+ <source>Could not get statement info</source>
+ <translation>无法取得叙述信息</translation>
+ </message>
+ <message>
+ <source>Unable to create BLOB</source>
+ <translation>无法建立 BLOB</translation>
+ </message>
+ <message>
+ <source>Unable to read BLOB</source>
+ <translation>无法读取 BLOB</translation>
+ </message>
+</context>
+<context>
+ <name>QMYSQLDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Unable to open database &apos;</source>
+ <translation>无法开启数据库&apos;</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>无法联机</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>无法开始事务</translation>
+ </message>
+</context>
+<context>
+ <name>QOCIDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Unable to initialize</source>
+ <translation>无法初始化</translation>
+ </message>
+ <message>
+ <source>Unable to logon</source>
+ <translation>无法登入</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>无法开始事务</translation>
+ </message>
+</context>
+<context>
+ <name>QODBCDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Unable to enable autocommit</source>
+ <translation>无法开启自动提交功能</translation>
+ </message>
+ <message>
+ <source>Unable to connect - Driver doesn&apos;t support all needed functionality</source>
+ <translation>无法连接─驱动程序无法&apos;支持所有需要的功能</translation>
+ </message>
+ <message>
+ <source>Unable to disable autocommit</source>
+ <translation>无法关闭自动提交功能</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>无法连接</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLite2Driver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Error to open database</source>
+ <translation>开启数据库时发生错误</translation>
+ </message>
+ <message>
+ <source>Unable to rollback Transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>无法开始事务</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLiteDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Error closing database</source>
+ <translation>关闭数据库发生错误</translation>
+ </message>
+ <message>
+ <source>Error opening database</source>
+ <translation>开启数据库发生错误</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>无法开始事务</translation>
+ </message>
+</context>
+<context>
+ <name>QAbstractSocket</name>
+ <message>
+ <source>Host not found</source>
+ <translation>找不到主机</translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation>联机被拒</translation>
+ </message>
+ <message>
+ <source>Connection timed out</source>
+ <translation>联机逾时</translation>
+ </message>
+ <message>
+ <source>Socket is not connected</source>
+ <translation>Socket 未联机</translation>
+ </message>
+ <message>
+ <source>Socket operation timed out</source>
+ <translation>Socket 操作逾时</translation>
+ </message>
+ <message>
+ <source>Network unreachable</source>
+ <translation>无法使用网络</translation>
+ </message>
+ <message>
+ <source>Operation on socket is not supported</source>
+ <translation>Socket 的操作未被支持</translation>
+ </message>
+</context>
+<context>
+ <name>QHostInfoAgent</name>
+ <message>
+ <source>Host not found</source>
+ <translation>找不到主机</translation>
+ </message>
+ <message>
+ <source>Unknown address type</source>
+ <translation>未知的地址型态</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的错误</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::Gstreamer::MediaObject</name>
+ <message>
+ <source>Could not open media source.</source>
+ <translation>无法开启媒体来源。</translation>
+ </message>
+ <message>
+ <source>Could not decode media source.</source>
+ <translation>无法译码媒体来源。</translation>
+ </message>
+ <message>
+ <source>Invalid source type.</source>
+ <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>
+ </message>
+ <message>
+ <source>Could not open audio device. The device is already in use.</source>
+ <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>
+ </message>
+ <message>
+ <source>Could not locate media source.</source>
+ <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>
+ </message>
+ <message>
+ <source>Cannot unload library %1: %2</source>
+ <translation>无法卸除函式库 %1：%2</translation>
+ </message>
+ <message>
+ <source>Cannot load library %1: %2</source>
+ <translation>无法加载函式库 %1：%2</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>
+ </message>
+ <message>
+ <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
+ <translation>无法反解 %2 内的符号 &quot;%1&quot;：%3</translation>
+ </message>
+ <message>
+ <source>Plugin verification data mismatch in &apos;%1&apos;</source>
+ <translation>在 &apos;%1&apos; 中的插件确认数据不符合</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>
+ </message>
+ <message>
+ <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
+ <translation>文件 &apos;%1&apos; 不是合法的 Qt 插件。</translation>
+ </message>
+ <message>
+ <source>The shared library was not found.</source>
+ <translation>找不到分享函式库。</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <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>
+ </message>
+ <message>
+ <source>Could not mmap &apos;%1&apos;: %2</source>
+ <translation>无法 mmap &apos;%1&apos;：%2</translation>
+ </message>
+</context>
+<context>
+ <name>QHttp</name>
+ <message>
+ <source>Connection refused (or timed out)</source>
+ <translation>联机被拒（或联机逾时）</translation>
+ </message>
+ <message>
+ <source>Data corrupted</source>
+ <translation>资料已损毁</translation>
+ </message>
+ <message>
+ <source>Connected to host</source>
+ <translation>已联机到主机</translation>
+ </message>
+ <message>
+ <source>Connected to host %1</source>
+ <translation>已连接到主机 %1</translation>
+ </message>
+ <message>
+ <source>Host %1 not found</source>
+ <translation>找不到主机 %1</translation>
+ </message>
+ <message>
+ <source>Host requires authentication</source>
+ <translation>主机需要认证</translation>
+ </message>
+ <message>
+ <source>Error writing response to device</source>
+ <translation>写入响应到装置时发生错误</translation>
+ </message>
+ <message>
+ <source>HTTPS connection requested but SSL support not compiled in</source>
+ <translation>HTTPS 联机需要的 SSL 支持并未编译进来</translation>
+ </message>
+ <message>
+ <source>Host found</source>
+ <translation>找到主机</translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation>联机被拒</translation>
+ </message>
+ <message>
+ <source>Proxy authentication required</source>
+ <translation>代理服务器需要认证</translation>
+ </message>
+ <message>
+ <source>Unknown protocol specified</source>
+ <translation>指定了未知的协定</translation>
+ </message>
+ <message>
+ <source>HTTP request failed</source>
+ <translation>HTTP 要求失败</translation>
+ </message>
+ <message>
+ <source>Proxy requires authentication</source>
+ <translation>代理服务器需要认证</translation>
+ </message>
+ <message>
+ <source>Authentication required</source>
+ <translation>需要认证</translation>
+ </message>
+ <message>
+ <source>SSL handshake failed</source>
+ <translation>SSL 沟通失败</translation>
+ </message>
+ <message>
+ <source>Connection to %1 closed</source>
+ <translation>到 %1 的联机已关闭</translation>
+ </message>
+ <message>
+ <source>Invalid HTTP chunked body</source>
+ <translation>不合法的 HTTP 区块主体</translation>
+ </message>
+ <message>
+ <source>Host %1 found</source>
+ <translation>找到主机 %1</translation>
+ </message>
+ <message>
+ <source>Wrong content length</source>
+ <translation>错误的内容长度</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的错误</translation>
+ </message>
+ <message>
+ <source>Invalid HTTP response header</source>
+ <translation>不合法的 HTTP 回复标头</translation>
+ </message>
+ <message>
+ <source>Connection closed</source>
+ <translation>联机已关闭</translation>
+ </message>
+ <message>
+ <source>No server set to connect to</source>
+ <translation>没有设置要联机到哪个服务器</translation>
+ </message>
+ <message>
+ <source>Server closed connection unexpectedly</source>
+ <translation>服务器无预警关闭联机</translation>
+ </message>
+ <message>
+ <source>Request aborted</source>
+ <translation>要求中止</translation>
+ </message>
+</context>
+<context>
+ <name>QXml</name>
+ <message>
+ <source>unparsed entity reference in wrong context</source>
+ <translation>在错误的内文中有未剖析的实体参考</translation>
+ </message>
+ <message>
+ <source>external parsed general entity reference not allowed in DTD</source>
+ <translation>在 DTD 中不允许使用外部剖析的实体参考</translation>
+ </message>
+ <message>
+ <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>no error occurred</source>
+ <translation>没有发生错误</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing reference</source>
+ <translation>剖析参考时发生错误</translation>
+ </message>
+ <message>
+ <source>standalone declaration expected while reading the XML declaration</source>
+ <translation>读取 XML 宣告时应有读立宣告</translation>
+ </message>
+ <message>
+ <source>invalid name for processing instruction</source>
+ <translation>处理指令时的不合法名称</translation>
+ </message>
+ <message>
+ <source>error triggered by consumer</source>
+ <translation>用户触发的错误</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing element</source>
+ <translation>剖析元素时发生错误</translation>
+ </message>
+ <message>
+ <source>unexpected character</source>
+ <translation>非预期的字符</translation>
+ </message>
+ <message>
+ <source>tag mismatch</source>
+ <translation>标签不对称</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing content</source>
+ <translation>剖析内容时发生错误</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing comment</source>
+ <translation>剖析批注时发生错误</translation>
+ </message>
+ <message>
+ <source>internal general entity reference not allowed in DTD</source>
+ <translation>在 DTD 中不允许内部产生的实体参考</translation>
+ </message>
+ <message>
+ <source>recursive entities</source>
+ <translation>递归的实体</translation>
+ </message>
+ <message>
+ <source>more than one document type definition</source>
+ <translation>定义了一个以上的文文件型态</translation>
+ </message>
+ <message>
+ <source>version expected while reading the XML declaration</source>
+ <translation>读取 XML 宣告时应有版本号</translation>
+ </message>
+ <message>
+ <source>letter is expected</source>
+ <translation>预期应为字母</translation>
+ </message>
+ <message>
+ <source>unexpected end of file</source>
+ <translation>未预期遇到文件结尾</translation>
+ </message>
+ <message>
+ <source>external parsed general entity reference not allowed in attribute value</source>
+ <translation>在属性值中不允许使用外部剖析的实体参考</translation>
+ </message>
+ <message>
+ <source>error in the text declaration of an external entity</source>
+ <translation>在外部实体中的文本宣告有错误</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing document type definition</source>
+ <translation>剖析文文件型态定义时发生错误</translation>
+ </message>
+</context>
+<context>
+ <name>QSystemSemaphore</name>
+ <message>
+ <source>%1: does not exist</source>
+ <translation>%1：不存在</translation>
+ </message>
+ <message>
+ <source>%1: already exists</source>
+ <translation>%1：已存在</translation>
+ </message>
+ <message>
+ <source>%1: unknown error %2</source>
+ <translation>%1：未知的错误 %2</translation>
+ </message>
+ <message>
+ <source>%1: permission denied</source>
+ <translation>%1：存取被拒</translation>
+ </message>
+ <message>
+ <source>%1: out of resources</source>
+ <translation>%1：资源不足</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLiteResult</name>
+ <message>
+ <source>Unable to fetch row</source>
+ <translation>无法抓取列</translation>
+ </message>
+ <message>
+ <source>No query</source>
+ <translation>没有查询</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>无法执行叙述</translation>
+ </message>
+ <message>
+ <source>Unable to bind parameters</source>
+ <translation>无法结合参数</translation>
+ </message>
+ <message>
+ <source>Unable to reset statement</source>
+ <translation>无法重置叙述</translation>
+ </message>
+ <message>
+ <source>Parameter count mismatch</source>
+ <translation>参数数量不符合</translation>
+ </message>
+</context>
+<context>
+ <name>QApplication</name>
+ <message>
+ <source>Activates the program&apos;s main window</source>
+ <translation>启动程序的主窗口</translation>
+ </message>
+ <message>
+ <source>QT_LAYOUT_DIRECTION</source>
+ <translation>LTR</translation>
+ </message>
+ <message>
+ <source>Activate</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>
+ </message>
+ <message>
+ <source>Incompatible Qt Library Error</source>
+ <translation>Qt 函式库不相容的错误</translation>
+ </message>
+</context>
+<context>
+ <name>QUnicodeControlCharacterMenu</name>
+ <message>
+ <source>RLE Start of right-to-left embedding</source>
+ <translation>RLE 右到左嵌入起点</translation>
+ </message>
+ <message>
+ <source>ZWSP Zero width space</source>
+ <translation>ZWSP 零宽度空白</translation>
+ </message>
+ <message>
+ <source>Insert Unicode control character</source>
+ <translation>插入万国码控制字符</translation>
+ </message>
+ <message>
+ <source>LRO Start of left-to-right override</source>
+ <translation>LRO 左到右覆写起点</translation>
+ </message>
+ <message>
+ <source>LRE Start of left-to-right embedding</source>
+ <translation>LRE 左到右嵌入起点</translation>
+ </message>
+ <message>
+ <source>RLM Right-to-left mark</source>
+ <translation>RLM 右到左标记</translation>
+ </message>
+ <message>
+ <source>PDF Pop directional formatting</source>
+ <translation>PDF 弹出方向格式</translation>
+ </message>
+ <message>
+ <source>ZWNJ Zero width non-joiner</source>
+ <translation>ZWNJ 零宽度非连接器</translation>
+ </message>
+ <message>
+ <source>RLO Start of right-to-left override</source>
+ <translation>RLO 右到左覆写起点</translation>
+ </message>
+ <message>
+ <source>ZWJ Zero width joiner</source>
+ <translation>ZWJ 零宽度连接器</translation>
+ </message>
+ <message>
+ <source>LRM Left-to-right mark</source>
+ <translation>LRM 左到右标记</translation>
+ </message>
+</context>
+<context>
+ <name>QWebFrame</name>
+ <message>
+ <source>Request blocked</source>
+ <translation>请求已被阻挡</translation>
+ </message>
+ <message>
+ <source>Request cancelled</source>
+ <translation>请求已取消</translation>
+ </message>
+ <message>
+ <source>Cannot show URL</source>
+ <translation>无法显示网址</translation>
+ </message>
+ <message>
+ <source>Frame load interruped by policy change</source>
+ <translation>影像加载因政策变更而中断</translation>
+ </message>
+ <message>
+ <source>File does not exist</source>
+ <translation>文件不存在</translation>
+ </message>
+ <message>
+ <source>Cannot show mimetype</source>
+ <translation>无法显示 MIME 型态</translation>
+ </message>
+</context>
+<context>
+ <name>QRegExp</name>
+ <message>
+ <source>bad lookahead syntax</source>
+ <translation>错误的 lookahead 语法</translation>
+ </message>
+ <message>
+ <source>no error occurred</source>
+ <translation>没有发生错误</translation>
+ </message>
+ <message>
+ <source>missing left delim</source>
+ <translation>少了左方的区隔符</translation>
+ </message>
+ <message>
+ <source>bad char class syntax</source>
+ <translation>错误的字符类别语法</translation>
+ </message>
+ <message>
+ <source>disabled feature used</source>
+ <translation>使用已关闭的功能</translation>
+ </message>
+ <message>
+ <source>invalid octal value</source>
+ <translation>不合法的八进制值</translation>
+ </message>
+ <message>
+ <source>bad repetition syntax</source>
+ <translation>错误的重复语法</translation>
+ </message>
+ <message>
+ <source>met internal limit</source>
+ <translation>遇到内部限制</translation>
+ </message>
+ <message>
+ <source>unexpected end</source>
+ <translation>未预期遇到结尾</translation>
+ </message>
+</context>
+<context>
+ <name>QHttpSocketEngine</name>
+ <message>
+ <source>Proxy connection refused</source>
+ <translation>代理服务器联机被拒</translation>
+ </message>
+ <message>
+ <source>Proxy denied connection</source>
+ <translation>代理服务器拒绝联机</translation>
+ </message>
+ <message>
+ <source>Proxy server not found</source>
+ <translation>找不到代理服务器</translation>
+ </message>
+ <message>
+ <source>Proxy server connection timed out</source>
+ <translation>代理服务器联机逾时</translation>
+ </message>
+ <message>
+ <source>Did not receive HTTP response from proxy</source>
+ <translation>未从代理服务器接收到 HTTP 响应</translation>
+ </message>
+ <message>
+ <source>Proxy connection closed prematurely</source>
+ <translation>代理服务器联机已不正常关闭</translation>
+ </message>
+ <message>
+ <source>Error communicating with HTTP proxy</source>
+ <translation>与 HTTP 代理服务器联系时发生错误</translation>
+ </message>
+ <message>
+ <source>Authentication required</source>
+ <translation>需要认证</translation>
+ </message>
+ <message>
+ <source>Error parsing authentication request from proxy</source>
+ <translation>剖析从代理服务器传来的认证要求时发生错误</translation>
+ </message>
+</context>
+<context>
+ <name>QOCIResult</name>
+ <message>
+ <source>Unable to alloc statement</source>
+ <translation>无法配置叙述</translation>
+ </message>
+ <message>
+ <source>Unable to goto next</source>
+ <translation>无法跳到下一个</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>无法执行叙述</translation>
+ </message>
+ <message>
+ <source>Unable to bind column for batch execute</source>
+ <translation>无法结合字段以做批执行</translation>
+ </message>
+ <message>
+ <source>Unable to execute select statement</source>
+ <translation>无法执行选取的叙述</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>无法准备叙述</translation>
+ </message>
+ <message>
+ <source>Unable to execute batch statement</source>
+ <translation>无法执行批叙述</translation>
+ </message>
+ <message>
+ <source>Unable to bind value</source>
+ <translation>无法结合数值</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkReply</name>
+ <message>
+ <source>Error downloading %1 - server replied: %2</source>
+ <translation>下载 %1 时发生错误─服务器回应：%2</translation>
+ </message>
+ <message>
+ <source>Protocol &quot;%1&quot; is unknown</source>
+ <translation>未知的协定 &quot;%1&quot;</translation>
+ </message>
+</context>
+<context>
+ <name>QAbstractSpinBox</name>
+ <message>
+ <source>Step &amp;down</source>
+ <translation>单步向&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Step up</source>
+ <translation>&amp;单步向上</translation>
+ </message>
+ <message>
+ <source>&amp;Select All</source>
+ <translation>&amp;全部选择</translation>
+ </message>
+</context>
+<context>
+ <name>QDB2Result</name>
+ <message>
+ <source>Unable to bind variable</source>
+ <translation>无法结合变量</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>无法执行叙述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch next</source>
+ <translation>无法抓取下一笔</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>无法准备叙述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch record %1</source>
+ <translation>无法抓取纪录 %1</translation>
+ </message>
+ <message>
+ <source>Unable to fetch first</source>
+ <translation>无法抓取第一笔</translation>
+ </message>
+</context>
+<context>
+ <name>QODBCResult</name>
+ <message>
+ <source>Unable to bind variable</source>
+ <translation>无法结合变量</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>无法执行叙述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch next</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 fetch previous</source>
+ <translation>无法抓取前一笔</translation>
+ </message>
+ <message>
+ <source>Unable to fetch</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>
+ </message>
+ <message>
+ <source>Unable to fetch first</source>
+ <translation>无法抓取第一笔</translation>
+ </message>
+</context>
+<context>
+ <name>QPSQLDriver</name>
+ <message>
+ <source>Unable to subscribe</source>
+ <translation>无法订阅</translation>
+ </message>
+ <message>
+ <source>Could not begin transaction</source>
+ <translation>无法开始事务</translation>
+ </message>
+ <message>
+ <source>Could not rollback transaction</source>
+ <translation>无法反转事务</translation>
+ </message>
+ <message>
+ <source>Could not commit transaction</source>
+ <translation>无法提交事务</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>无法联机</translation>
+ </message>
+ <message>
+ <source>Unable to unsubscribe</source>
+ <translation>无法取消订阅</translation>
+ </message>
+</context>
+<context>
+ <name>QInputDialog</name>
+ <message>
+ <source>Enter a value:</source>
+ <translation>请输入值:</translation>
+ </message>
+</context>
+<context>
+ <name>QCoreApplication</name>
+ <message>
+ <source>%1: key is empty</source>
+ <translation>%1：键值是空的</translation>
+ </message>
+ <message>
+ <source>%1: unable to make key</source>
+ <translation>%1：无法产生键值</translation>
+ </message>
+ <message>
+ <source>%1: ftok failed</source>
+ <translation>%1：ftok 失败</translation>
+ </message>
+</context>
+<context>
+ <name>QIODevice</name>
+ <message>
+ <source>No such file or directory</source>
+ <translation>找不到该文件或目录</translation>
+ </message>
+ <message>
+ <source>Permission denied</source>
+ <translation>权限不足</translation>
+ </message>
+ <message>
+ <source>No space left on device</source>
+ <translation>装置上已无空间</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的错误</translation>
+ </message>
+ <message>
+ <source>Too many open files</source>
+ <translation>开启过多文件</translation>
+ </message>
+</context>
+<context>
+ <name>QMultiInputContext</name>
+ <message>
+ <source>Select IM</source>
+ <translation>选择输入法</translation>
+ </message>
+</context>
+<context>
+ <name>QTabBar</name>
+ <message>
+ <source>Scroll Left</source>
+ <translation>往左滚动条</translation>
+ </message>
+ <message>
+ <source>Scroll Right</source>
+ <translation>往右滚动条</translation>
+ </message>
+</context>
+<context>
+ <name>QUndoModel</name>
+ <message>
+ <source>&lt;empty&gt;</source>
+ <translation>&lt;空白&gt;</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessCacheBackend</name>
+ <message>
+ <source>Error opening %1</source>
+ <translation>开启 %1 发生错误</translation>
+ </message>
+</context>
+<context>
+ <name>QMYSQLResult</name>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>无法执行叙述</translation>
+ </message>
+ <message>
+ <source>Unable to store statement results</source>
+ <translation>无法保存叙述结果</translation>
+ </message>
+ <message>
+ <source>Unable to execute next query</source>
+ <translation>无法执行下一个查询</translation>
+ </message>
+ <message>
+ <source>Unable to bind outvalues</source>
+ <translation>无法结合输出值</translation>
+ </message>
+ <message>
+ <source>Unable to store next result</source>
+ <translation>无法保存下一个结果</translation>
+ </message>
+ <message>
+ <source>Unable to fetch data</source>
+ <translation>无法抓取数据</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>无法准备叙述</translation>
+ </message>
+ <message>
+ <source>Unable to store result</source>
+ <translation>无法保存结果</translation>
+ </message>
+ <message>
+ <source>Unable to bind value</source>
+ <translation>无法结合数值</translation>
+ </message>
+ <message>
+ <source>Unable to execute query</source>
+ <translation>无法执行查询</translation>
+ </message>
+ <message>
+ <source>Unable to reset statement</source>
+ <translation>无法重置叙述</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLite2Result</name>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>无法执行叙述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch results</source>
+ <translation>无法抓取结果</translation>
+ </message>
+</context>
+<context>
+ <name>Q3MainWindow</name>
+ <message>
+ <source>Line up</source>
+ <translation>排列</translation>
+ </message>
+ <message>
+ <source>Customize...</source>
+ <translation>自定义...</translation>
+ </message>
+</context>
+<context>
+ <name>QUdpSocket</name>
+ <message>
+ <source>This platform does not support IPv6</source>
+ <translation>此平台不支援 IPv6</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::Gstreamer::Backend</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>
+ </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>
+ </message>
+</context>
+<context>
+ <name>QLocalServer</name>
+ <message>
+ <source>%1: Name error</source>
+ <translation>%1：名称错误</translation>
+ </message>
+ <message>
+ <source>%1: Unknown error %2</source>
+ <translation>%1：未知的错误 %2</translation>
+ </message>
+ <message>
+ <source>%1: Permission denied</source>
+ <translation>%1：存取被拒</translation>
+ </message>
+ <message>
+ <source>%1: Address in use</source>
+ <translation>%1：地址使用中</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::VolumeSlider</name>
+ <message>
+ <source>Volume: %1%</source>
+ <translation>音量：%1%</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>
+ </message>
+</context>
+<context>
+ <name>Q3ToolBar</name>
+ <message>
+ <source>More...</source>
+ <translation>更多...</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>
+ </message>
+ <message>
+ <source>Multiple input method switcher</source>
+ <translation>多重输入法切换器</translation>
+ </message>
+</context>
+<context>
+ <name>Q3ProgressDialog</name>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+</context>
+<context>
+ <name>QProgressDialog</name>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+</context>
+<context>
+ <name>QFile</name>
+ <message>
+ <source>Cannot create %1 for output</source>
+ <translation>无法建立 %1 以输出</translation>
+ </message>
+ <message>
+ <source>Failure to write block</source>
+ <translation>写入区块时失败</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for input</source>
+ <translation>无法开启 %1 以输入</translation>
+ </message>
+ <message>
+ <source>Destination file exists</source>
+ <translation>目标文件已存在</translation>
+ </message>
+ <message>
+ <source>Cannot open for output</source>
+ <translation>无法开启进行输出</translation>
+ </message>
+</context>
+<context>
+ <name>QTDSDriver</name>
+ <message>
+ <source>Unable to open connection</source>
+ <translation>无法开启联机</translation>
+ </message>
+ <message>
+ <source>Unable to use database</source>
+ <translation>无法使用数据库</translation>
+ </message>
+</context>
+<context>
+ <name>AudioOutput</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>
+ </message>
+ <message>
+ <source>Revert back to device &apos;%1&apos;</source>
+ <translation>回复到装置 &apos;%1&apos;</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>
+ </message>
+</context>
+<context>
+ <name>QPluginLoader</name>
+ <message>
+ <source>The plugin was not loaded.</source>
+ <translation>插件未载入。</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的错误</translation>
+ </message>
+</context>
+<context>
+ <name>QSlider</name>
+ <message>
+ <source>Page up</source>
+ <translation>页面上方</translation>
+ </message>
+ <message>
+ <source>Position</source>
+ <translation>位置</translation>
+ </message>
+ <message>
+ <source>Page right</source>
+ <translation>页面右方</translation>
+ </message>
+ <message>
+ <source>Page down</source>
+ <translation>页面下方</translation>
+ </message>
+ <message>
+ <source>Page left</source>
+ <translation>页面左方</translation>
+ </message>
+</context>
+<context>
+ <name>CloseButton</name>
+ <message>
+ <source>Close Tab</source>
+ <translation>关闭分页</translation>
+ </message>
+</context>
+<context>
+ <name>QPSQLResult</name>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>无法准备叙述</translation>
+ </message>
+ <message>
+ <source>Unable to create query</source>
+ <translation>无法建立查询</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessFileBackend</name>
+ <message>
+ <source>Request for opening non-local file %1</source>
+ <translation>要求开启非本地端文件 %1</translation>
+ </message>
+ <message>
+ <source>Read error reading from %1: %2</source>
+ <translation>从 %1 读取错误：%2</translation>
+ </message>
+ <message>
+ <source>Cannot open %1: Path is a directory</source>
+ <translation>无法开启 %1：此路径是一个目录</translation>
+ </message>
+ <message>
+ <source>Error opening %1: %2</source>
+ <translation>开启 %1 发生错误：%2</translation>
+ </message>
+ <message>
+ <source>Write error writing to %1: %2</source>
+ <translation>写入 %1 时发生错误：%2</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkReplyImpl</name>
+ <message>
+ <source>Operation canceled</source>
+ <translation>取消操作</translation>
+ </message>
+</context>
+<context>
+ <name>Q3NetworkProtocol</name>
+ <message>
+ <source>Operation stopped by the user</source>
+ <translation>用户已中止操作</translation>
+ </message>
+</context>
+<context>
+ <name>QMdiArea</name>
+ <message>
+ <source>(Untitled)</source>
+ <translation>（未命名）</translation>
+ </message>
+</context>
+<context>
+ <name>QHostInfo</name>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的错误</translation>
+ </message>
+</context>
+<context>
+ <name>Q3Accel</name>
+ <message>
+ <source>%1, %2 not defined</source>
+ <translation>%1，%2 未定义</translation>
+ </message>
+ <message>
+ <source>Ambiguous %1 not handled</source>
+ <translation>不明确的 %1 尚未处理</translation>
+ </message>
+</context>
+<context>
+ <name>QTcpServer</name>
+ <message>
+ <source>Operation on socket is not supported</source>
+ <translation>Socket 的操作未被支持</translation>
+ </message>
+</context>
+</TS>

avidemux_2.7.1.tar.gz/avidemux/qt4/i18n/qtbase_zh_TW.ts Added

@@ -0,0 +1,6033 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_TW">
+<context>
+ <name>QWidget</name>
+ <message>
+ <source>*</source>
+ <translation>+</translation>
+ </message>
+</context>
+<context>
+ <name>QShortcut</name>
+ <message>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>否</translation>
+ </message>
+ <message>
+ <source>Up</source>
+ <translation>上鍵</translation>
+ </message>
+ <message>
+ <source>Alt</source>
+ <translation>Alt</translation>
+ </message>
+ <message>
+ <source>F%1</source>
+ <translation>F%1</translation>
+ </message>
+ <message>
+ <source>Del</source>
+ <translation>Del</translation>
+ </message>
+ <message>
+ <source>End</source>
+ <translation>End</translation>
+ </message>
+ <message>
+ <source>Esc</source>
+ <translation>Esc</translation>
+ </message>
+ <message>
+ <source>Ins</source>
+ <translation>Ins</translation>
+ </message>
+ <message>
+ <source>Tab</source>
+ <translation>Tab</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>是</translation>
+ </message>
+ <message>
+ <source>Back</source>
+ <translation>返回</translation>
+ </message>
+ <message>
+ <source>Call</source>
+ <translation>呼叫</translation>
+ </message>
+ <message>
+ <source>Ctrl</source>
+ <translation>Ctrl</translation>
+ </message>
+ <message>
+ <source>Down</source>
+ <translation>下鍵</translation>
+ </message>
+ <message>
+ <source>Flip</source>
+ <translation>反轉</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>說明</translation>
+ </message>
+ <message>
+ <source>Home</source>
+ <translation>Home</translation>
+ </message>
+ <message>
+ <source>Left</source>
+ <translation>左鍵</translation>
+ </message>
+ <message>
+ <source>Menu</source>
+ <translation>選單</translation>
+ </message>
+ <message>
+ <source>Meta</source>
+ <translation>Meta</translation>
+ </message>
+ <message>
+ <source>PgUp</source>
+ <translation>PgUp</translation>
+ </message>
+ <message>
+ <source>Stop</source>
+ <translation>停止</translation>
+ </message>
+ <message>
+ <source>Enter</source>
+ <translation>Enter</translation>
+ </message>
+ <message>
+ <source>Pause</source>
+ <translation>Pause</translation>
+ </message>
+ <message>
+ <source>Print</source>
+ <translation>Print</translation>
+ </message>
+ <message>
+ <source>Right</source>
+ <translation>右鍵</translation>
+ </message>
+ <message>
+ <source>Shift</source>
+ <translation>Shift</translation>
+ </message>
+ <message>
+ <source>Space</source>
+ <translation>空白鍵</translation>
+ </message>
+ <message>
+ <source>Media Record</source>
+ <translation>媒體錄音</translation>
+ </message>
+ <message>
+ <source>Print Screen</source>
+ <translation>列印螢幕</translation>
+ </message>
+ <message>
+ <source>Treble Down</source>
+ <translation>Treble Down</translation>
+ </message>
+ <message>
+ <source>Scroll Lock</source>
+ <translation>捲軸鎖定</translation>
+ </message>
+ <message>
+ <source>Volume Down</source>
+ <translation>音量降低</translation>
+ </message>
+ <message>
+ <source>Volume Mute</source>
+ <translation>靜音</translation>
+ </message>
+ <message>
+ <source>Media Previous</source>
+ <translation>媒體前一首</translation>
+ </message>
+ <message>
+ <source>Home Page</source>
+ <translation>首頁</translation>
+ </message>
+ <message>
+ <source>Volume Up</source>
+ <translation>音量提高</translation>
+ </message>
+ <message>
+ <source>Launch (6)</source>
+ <translation>啟動（6）</translation>
+ </message>
+ <message>
+ <source>Launch (7)</source>
+ <translation>啟動（7）</translation>
+ </message>
+ <message>
+ <source>Launch (8)</source>
+ <translation>啟動（8）</translation>
+ </message>
+ <message>
+ <source>Launch (9)</source>
+ <translation>啟動（9）</translation>
+ </message>
+ <message>
+ <source>Launch (2)</source>
+ <translation>啟動（2）</translation>
+ </message>
+ <message>
+ <source>Launch (3)</source>
+ <translation>啟動（3）</translation>
+ </message>
+ <message>
+ <source>Launch (4)</source>
+ <translation>啟動（4）</translation>
+ </message>
+ <message>
+ <source>Launch (5)</source>
+ <translation>啟動（5）</translation>
+ </message>
+ <message>
+ <source>Launch (0)</source>
+ <translation>啟動（0）</translation>
+ </message>
+ <message>
+ <source>Launch (1)</source>
+ <translation>啟動（1）</translation>
+ </message>
+ <message>
+ <source>Launch (F)</source>
+ <translation>啟動（F）</translation>
+ </message>
+ <message>
+ <source>Launch (B)</source>
+ <translation>啟動（B）</translation>
+ </message>
+ <message>
+ <source>Launch (C)</source>
+ <translation>啟動（C）</translation>
+ </message>
+ <message>
+ <source>Launch (D)</source>
+ <translation>啟動（D）</translation>
+ </message>
+ <message>
+ <source>Launch (E)</source>
+ <translation>啟動（E）</translation>
+ </message>
+ <message>
+ <source>Launch (A)</source>
+ <translation>啟動（A）</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <source>Escape</source>
+ <translation>Escape</translation>
+ </message>
+ <message>
+ <source>Hangup</source>
+ <translation>掛斷</translation>
+ </message>
+ <message>
+ <source>Insert</source>
+ <translation>插入</translation>
+ </message>
+ <message>
+ <source>Bass Boost</source>
+ <translation>重低音</translation>
+ </message>
+ <message>
+ <source>PgDown</source>
+ <translation>PgDown</translation>
+ </message>
+ <message>
+ <source>Return</source>
+ <translation>Return</translation>
+ </message>
+ <message>
+ <source>Search</source>
+ <translation>搜尋</translation>
+ </message>
+ <message>
+ <source>Select</source>
+ <translation>選擇</translation>
+ </message>
+ <message>
+ <source>SysReq</source>
+ <translation>SysReq</translation>
+ </message>
+ <message>
+ <source>NumLock</source>
+ <translation>數字鎖定</translation>
+ </message>
+ <message>
+ <source>ScrollLock</source>
+ <translation>捲軸鎖定</translation>
+ </message>
+ <message>
+ <source>Context1</source>
+ <translation>內文1</translation>
+ </message>
+ <message>
+ <source>Context2</source>
+ <translation>內文2</translation>
+ </message>
+ <message>
+ <source>Context3</source>
+ <translation>內文3</translation>
+ </message>
+ <message>
+ <source>Context4</source>
+ <translation>內文4</translation>
+ </message>
+ <message>
+ <source>Page Up</source>
+ <translation>往上一頁</translation>
+ </message>
+ <message>
+ <source>Open URL</source>
+ <translation>開啟網址</translation>
+ </message>
+ <message>
+ <source>Caps Lock</source>
+ <translation>大寫鎖定</translation>
+ </message>
+ <message>
+ <source>System Request</source>
+ <translation>系統要求 SysRq</translation>
+ </message>
+ <message>
+ <source>CapsLock</source>
+ <translation>大寫鎖定</translation>
+ </message>
+ <message>
+ <source>Backtab</source>
+ <translation>Backtab</translation>
+ </message>
+ <message>
+ <source>Bass Up</source>
+ <translation>Bass Up</translation>
+ </message>
+ <message>
+ <source>Refresh</source>
+ <translation>刷新</translation>
+ </message>
+ <message>
+ <source>Launch Mail</source>
+ <translation>啟動郵件程式</translation>
+ </message>
+ <message>
+ <source>Backspace</source>
+ <translation>Backspace</translation>
+ </message>
+ <message>
+ <source>Bass Down</source>
+ <translation>Bass Down</translation>
+ </message>
+ <message>
+ <source>Standby</source>
+ <translation>待命</translation>
+ </message>
+ <message>
+ <source>Treble Up</source>
+ <translation>Treble Up</translation>
+ </message>
+ <message>
+ <source>Num Lock</source>
+ <translation>數字鎖定</translation>
+ </message>
+ <message>
+ <source>Number Lock</source>
+ <translation>數字鎖定</translation>
+ </message>
+ <message>
+ <source>Favorites</source>
+ <translation>我的最愛</translation>
+ </message>
+ <message>
+ <source>Forward</source>
+ <translation>往前</translation>
+ </message>
+ <message>
+ <source>Page Down</source>
+ <translation>往下一頁</translation>
+ </message>
+ <message>
+ <source>Media Play</source>
+ <translation>媒體播放</translation>
+ </message>
+ <message>
+ <source>Media Stop</source>
+ <translation>媒體停止</translation>
+ </message>
+ <message>
+ <source>Media Next</source>
+ <translation>媒體下一首</translation>
+ </message>
+ <message>
+ <source>Launch Media</source>
+ <translation>啟動媒體程式</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintDialog</name>
+ <message>
+ <source>A0</source>
+ <translation>A0</translation>
+ </message>
+ <message>
+ <source>A1</source>
+ <translation>A1</translation>
+ </message>
+ <message>
+ <source>A2</source>
+ <translation>A2</translation>
+ </message>
+ <message>
+ <source>A3</source>
+ <translation>A3</translation>
+ </message>
+ <message>
+ <source>A4</source>
+ <translation>A4</translation>
+ </message>
+ <message>
+ <source>A5</source>
+ <translation>A5</translation>
+ </message>
+ <message>
+ <source>A6</source>
+ <translation>A6</translation>
+ </message>
+ <message>
+ <source>A7</source>
+ <translation>A7</translation>
+ </message>
+ <message>
+ <source>A8</source>
+ <translation>A8</translation>
+ </message>
+ <message>
+ <source>A9</source>
+ <translation>A9</translation>
+ </message>
+ <message>
+ <source>B0</source>
+ <translation>B0</translation>
+ </message>
+ <message>
+ <source>B1</source>
+ <translation>B1</translation>
+ </message>
+ <message>
+ <source>B2</source>
+ <translation>B2</translation>
+ </message>
+ <message>
+ <source>B3</source>
+ <translation>B3</translation>
+ </message>
+ <message>
+ <source>B4</source>
+ <translation>B4</translation>
+ </message>
+ <message>
+ <source>B5</source>
+ <translation>B5</translation>
+ </message>
+ <message>
+ <source>B6</source>
+ <translation>B6</translation>
+ </message>
+ <message>
+ <source>B7</source>
+ <translation>B7</translation>
+ </message>
+ <message>
+ <source>B8</source>
+ <translation>B8</translation>
+ </message>
+ <message>
+ <source>B9</source>
+ <translation>B9</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>確定</translation>
+ </message>
+ <message>
+ <source>B10</source>
+ <translation>B10</translation>
+ </message>
+ <message>
+ <source>C5E</source>
+ <translation>C5E</translation>
+ </message>
+ <message>
+ <source>DLE</source>
+ <translation>DLE</translation>
+ </message>
+ <message>
+ <source>A6 (105 x 148 mm)</source>
+ <translation>A6 (105 x 148 mm)</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>
+ </message>
+ <message>
+ <source>Folio</source>
+ <translation>Folio</translation>
+ </message>
+ <message>
+ <source>Legal</source>
+ <translation>Legal</translation>
+ </message>
+ <message>
+ <source>Print all</source>
+ <translation>全部列印</translation>
+ </message>
+ <message>
+ <source>Print</source>
+ <translation>列印</translation>
+ </message>
+ <message>
+ <source>&amp;Options &lt;&lt;</source>
+ <translation>操作 (&amp;O) &lt;&lt;</translation>
+ </message>
+ <message>
+ <source>&amp;Options &gt;&gt;</source>
+ <translation>操作 (&amp;O) &gt;&gt;</translation>
+ </message>
+ <message>
+ <source>B6 (125 x 176 mm)</source>
+ <translation>B6 (125 x 176 mm)</translation>
+ </message>
+ <message>
+ <source>B8 (62 x 88 mm)</source>
+ <translation>B8 (62 x 88 mm)</translation>
+ </message>
+ <message>
+ <source>A8 (52 x 74 mm)</source>
+ <translation>A8 (52 x 74 mm)</translation>
+ </message>
+ <message>
+ <source>B9 (44 x 62 mm)</source>
+ <translation>B9 (44 x 62 mm)</translation>
+ </message>
+ <message>
+ <source>A9 (37 x 52 mm)</source>
+ <translation>A9 (37 x 52 mm)</translation>
+ </message>
+ <message>
+ <source>B0 (1000 x 1414 mm)</source>
+ <translation>B0 (1000 x 1414 mm)</translation>
+ </message>
+ <message>
+ <source>A5 (148 x 210 mm)</source>
+ <translation>A5 (148 x 210 mm)</translation>
+ </message>
+ <message>
+ <source>Tabloid (279 x 432 mm)</source>
+ <translation>Tabloid (279 x 432 mm)</translation>
+ </message>
+ <message>
+ <source>B10 (31 x 44 mm)</source>
+ <translation>B10 (31 x 44 mm)</translation>
+ </message>
+ <message>
+ <source>B2 (500 x 707 mm)</source>
+ <translation>B2 (500 x 707 mm)</translation>
+ </message>
+ <message>
+ <source>&amp;Print</source>
+ <translation>列印(&amp;P)</translation>
+ </message>
+ <message>
+ <source>A3 (297 x 420 mm)</source>
+ <translation>A3 (297 x 420 mm)</translation>
+ </message>
+ <message>
+ <source>Print selection</source>
+ <translation>列印選擇區</translation>
+ </message>
+ <message>
+ <source>Print to File (Postscript)</source>
+ <translation>列印到檔案（Postscript）</translation>
+ </message>
+ <message>
+ <source>B4 (250 x 353 mm)</source>
+ <translation>B4 (250 x 353 mm)</translation>
+ </message>
+ <message>
+ <source>%1 already exists.
+Do you want to overwrite it?</source>
+ <translation>%1 已存在。
+您要覆寫它嗎?</translation>
+ </message>
+ <message>
+ <source>A1 (594 x 841 mm)</source>
+ <translation>A1 (594 x 841 mm)</translation>
+ </message>
+ <message>
+ <source>Custom</source>
+ <translation>自訂</translation>
+ </message>
+ <message>
+ <source>B1 (707 x 1000 mm)</source>
+ <translation>B1 (707 x 1000 mm)</translation>
+ </message>
+ <message>
+ <source>Folio (210 x 330 mm)</source>
+ <translation>對開 (210 x 330 mm)</translation>
+ </message>
+ <message>
+ <source>Ledger</source>
+ <translation>Ledger</translation>
+ </message>
+ <message>
+ <source>Letter</source>
+ <translation>Letter</translation>
+ </message>
+ <message>
+ <source>DLE (110 x 220 mm)</source>
+ <translation>DLE (110 x 220 mm)</translation>
+ </message>
+ <message>
+ <source>C5E (163 x 229 mm)</source>
+ <translation>C5E (163 x 229 mm)</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>
+ </message>
+ <message>
+ <source>Print range</source>
+ <translation>列印範圍</translation>
+ </message>
+ <message>
+ <source>File exists</source>
+ <translation>檔案已存在</translation>
+ </message>
+ <message>
+ <source>Write %1 file</source>
+ <translation>寫入 %1 檔案</translation>
+ </message>
+ <message>
+ <source>A0 (841 x 1189 mm)</source>
+ <translation>A0 (841 x 1189 mm)</translation>
+ </message>
+ <message>
+ <source>Local file</source>
+ <translation>本地端檔案</translation>
+ </message>
+ <message>
+ <source>locally connected</source>
+ <translation>本地連接</translation>
+ </message>
+ <message>
+ <source>Ledger (432 x 279 mm)</source>
+ <translation>Ledger (432 x 279 mm)</translation>
+ </message>
+ <message>
+ <source>Aliases: %1</source>
+ <translation>別名：%1</translation>
+ </message>
+ <message>
+ <source>Print to File (PDF)</source>
+ <translation>列印到檔案（PDF）</translation>
+ </message>
+ <message>
+ <source>Print To File ...</source>
+ <translation>列印到檔案...</translation>
+ </message>
+ <message>
+ <source>US Common #10 Envelope (105 x 241 mm)</source>
+ <translation>US 常用 10 號信封 (105x241 mm)</translation>
+ </message>
+ <message>
+ <source>Tabloid</source>
+ <translation>Tabloid</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>
+ </message>
+ <message>
+ <source>Executive</source>
+ <translation>Executive</translation>
+ </message>
+ <message>
+ <source>unknown</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>
+ </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>
+ </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>
+ </message>
+ <message>
+ <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
+ <translation>起始數值不能大於結束數值。</translation>
+ </message>
+ <message>
+ <source>US Common #10 Envelope</source>
+ <translation>US Common #10 Envelope</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>B3 (353 x 500 mm)</source>
+ <translation>B3 (353 x 500 mm)</translation>
+ </message>
+ <message>
+ <source>A7 (74 x 105 mm)</source>
+ <translation>A7 (74 x 105 mm)</translation>
+ </message>
+ <message>
+ <source>A2 (420 x 594 mm)</source>
+ <translation>A2 (420 x 594 mm)</translation>
+ </message>
+ <message>
+ <source>B7 (88 x 125 mm)</source>
+ <translation>B7 (88 x 125 mm)</translation>
+ </message>
+</context>
+<context>
+ <name>QDateTimeEdit</name>
+ <message>
+ <source>AM</source>
+ <translation>AM</translation>
+ </message>
+ <message>
+ <source>PM</source>
+ <translation>PM</translation>
+ </message>
+ <message>
+ <source>am</source>
+ <translation>am</translation>
+ </message>
+ <message>
+ <source>pm</source>
+ <translation>pm</translation>
+ </message>
+</context>
+<context>
+ <name>Q3TabDialog</name>
+ <message>
+ <source>OK</source>
+ <translation>確定</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>說明</translation>
+ </message>
+ <message>
+ <source>Apply</source>
+ <translation>套用</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Defaults</source>
+ <translation>預設</translation>
+ </message>
+</context>
+<context>
+ <name>QAxSelect</name>
+ <message>
+ <source>OK</source>
+ <translation>確定</translation>
+ </message>
+ <message>
+ <source>COM &amp;Object:</source>
+ <translation>COM &amp;物件:</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;取消</translation>
+ </message>
+ <message>
+ <source>Select ActiveX Control</source>
+ <translation>選擇 ActiveX 控制</translation>
+ </message>
+</context>
+<context>
+ <name>QDialogButtonBox</name>
+ <message>
+ <source>OK</source>
+ <translation>確定</translation>
+ </message>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;確定</translation>
+ </message>
+ <message>
+ <source>&amp;No</source>
+ <translation>&amp;否</translation>
+ </message>
+ <message>
+ <source>&amp;Yes</source>
+ <translation>&amp;是</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>說明</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>開啟</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>儲存</translation>
+ </message>
+ <message>
+ <source>&amp;Save</source>
+ <translation>&amp;儲存</translation>
+ </message>
+ <message>
+ <source>Abort</source>
+ <translation>中止</translation>
+ </message>
+ <message>
+ <source>Apply</source>
+ <translation>套用</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>重置</translation>
+ </message>
+ <message>
+ <source>Retry</source>
+ <translation>重試</translation>
+ </message>
+ <message>
+ <source>Restore Defaults</source>
+ <translation>回復預設值</translation>
+ </message>
+ <message>
+ <source>&amp;Close</source>
+ <translation>&amp;關閉</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <source>Close without Saving</source>
+ <translation>關閉而不儲存</translation>
+ </message>
+ <message>
+ <source>N&amp;o to All</source>
+ <translation>全部&amp;回答否</translation>
+ </message>
+ <message>
+ <source>Save All</source>
+ <translation>全部儲存</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;取消</translation>
+ </message>
+ <message>
+ <source>Discard</source>
+ <translation>丟棄</translation>
+ </message>
+ <message>
+ <source>Yes to &amp;All</source>
+ <translation>全部&amp;回答是</translation>
+ </message>
+ <message>
+ <source>Don&apos;t Save</source>
+ <translation>不要&apos;儲存</translation>
+ </message>
+</context>
+<context>
+ <name>QMessageBox</name>
+ <message>
+ <source>OK</source>
+ <translation>確定</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>說明</translation>
+ </message>
+ <message>
+ <source>Show Details...</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>
+ </message>
+ <message>
+ <source>About Qt</source>
+ <translation>關於 Qt</translation>
+ </message>
+ <message>
+ <source>Hide Details...</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>
+ </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>
+ </message>
+</context>
+<context>
+ <name>QSql</name>
+ <message>
+ <source>No</source>
+ <translation>否</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>是</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <source>Insert</source>
+ <translation>插入</translation>
+ </message>
+ <message>
+ <source>Update</source>
+ <translation>更新</translation>
+ </message>
+ <message>
+ <source>Delete this record?</source>
+ <translation>要刪除這筆紀錄嗎?</translation>
+ </message>
+ <message>
+ <source>Save edits?</source>
+ <translation>要儲存編輯過的內容嗎?</translation>
+ </message>
+ <message>
+ <source>Confirm</source>
+ <translation>確認</translation>
+ </message>
+ <message>
+ <source>Cancel your edits?</source>
+ <translation>要取消編輯嗎?</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintSettingsOutput</name>
+ <message>
+ <source>to</source>
+ <translation>到</translation>
+ </message>
+ <message>
+ <source>Form</source>
+ <translation>表單</translation>
+ </message>
+ <message>
+ <source>None</source>
+ <translation>無</translation>
+ </message>
+ <message>
+ <source>Color</source>
+ <translation>顏色</translation>
+ </message>
+ <message>
+ <source>Print all</source>
+ <translation>全部列印</translation>
+ </message>
+ <message>
+ <source>Selection</source>
+ <translation>選擇區</translation>
+ </message>
+ <message>
+ <source>Long side</source>
+ <translation>長邊</translation>
+ </message>
+ <message>
+ <source>Copies</source>
+ <translation>份數</translation>
+ </message>
+ <message>
+ <source>Print range</source>
+ <translation>列印範圍</translation>
+ </message>
+ <message>
+ <source>Color Mode</source>
+ <translation>顏色模式</translation>
+ </message>
+ <message>
+ <source>Options</source>
+ <translation>選項</translation>
+ </message>
+ <message>
+ <source>Output Settings</source>
+ <translation>輸出設定</translation>
+ </message>
+ <message>
+ <source>Reverse</source>
+ <translation>反向</translation>
+ </message>
+ <message>
+ <source>Grayscale</source>
+ <translation>灰階</translation>
+ </message>
+ <message>
+ <source>Short side</source>
+ <translation>短邊</translation>
+ </message>
+ <message>
+ <source>Collate</source>
+ <translation>校對</translation>
+ </message>
+ <message>
+ <source>Copies:</source>
+ <translation>份數:</translation>
+ </message>
+ <message>
+ <source>Pages from</source>
+ <translation>指定頁面：從</translation>
+ </message>
+ <message>
+ <source>Duplex Printing</source>
+ <translation>雙工列印</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintPreviewDialog</name>
+ <message>
+ <source>%1%</source>
+ <translation>%1%</translation>
+ </message>
+ <message>
+ <source>Print Preview</source>
+ <translation>列印預覽</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>Print</source>
+ <translation>列印</translation>
+ </message>
+ <message>
+ <source>Fit page</source>
+ <translation>符合頁面</translation>
+ </message>
+ <message>
+ <source>Zoom in</source>
+ <translation>放大</translation>
+ </message>
+ <message>
+ <source>Landscape</source>
+ <translation>橫向</translation>
+ </message>
+ <message>
+ <source>Zoom out</source>
+ <translation>縮小</translation>
+ </message>
+ <message>
+ <source>Fit width</source>
+ <translation>符合寬度</translation>
+ </message>
+ <message>
+ <source>Portrait</source>
+ <translation>縱向</translation>
+ </message>
+ <message>
+ <source>Page Setup</source>
+ <translation>頁面設定</translation>
+ </message>
+ <message>
+ <source>Page setup</source>
+ <translation>列印設定</translation>
+ </message>
+ <message>
+ <source>Show overview of all pages</source>
+ <translation>顯示所有頁面預覽</translation>
+ </message>
+ <message>
+ <source>First page</source>
+ <translation>第一頁</translation>
+ </message>
+ <message>
+ <source>Last page</source>
+ <translation>最後一頁</translation>
+ </message>
+ <message>
+ <source>Show single page</source>
+ <translation>顯示單一頁面</translation>
+ </message>
+ <message>
+ <source>Export to PDF</source>
+ <translation>匯出到 PDF 檔</translation>
+ </message>
+ <message>
+ <source>Previous page</source>
+ <translation>前一頁</translation>
+ </message>
+ <message>
+ <source>Next page</source>
+ <translation>下一頁</translation>
+ </message>
+ <message>
+ <source>Show facing pages</source>
+ <translation>顯示封面</translation>
+ </message>
+ <message>
+ <source>Export to PostScript</source>
+ <translation>匯出到 PostScript 檔</translation>
+ </message>
+</context>
+<context>
+ <name>Q3FileDialog</name>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;確定</translation>
+ </message>
+ <message>
+ <source>&amp;No</source>
+ <translation>&amp;否</translation>
+ </message>
+ <message>
+ <source>Dir</source>
+ <translation>目錄</translation>
+ </message>
+ <message>
+ <source>&amp;Yes</source>
+ <translation>&amp;是</translation>
+ </message>
+ <message>
+ <source>Back</source>
+ <translation>返回</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>日期</translation>
+ </message>
+ <message>
+ <source>File</source>
+ <translation>檔案</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>名稱</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>開啟</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>大小</translation>
+ </message>
+ <message>
+ <source>Sort</source>
+ <translation>排序</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>型態</translation>
+ </message>
+ <message>
+ <source>&amp;Open</source>
+ <translation>&amp;開啟</translation>
+ </message>
+ <message>
+ <source>&amp;Save</source>
+ <translation>&amp;儲存</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>錯誤</translation>
+ </message>
+ <message>
+ <source>Open </source>
+ <translation>開啟 </translation>
+ </message>
+ <message>
+ <source>Write: %1</source>
+ <translation>寫入：%1</translation>
+ </message>
+ <message>
+ <source>Sort by &amp;Size</source>
+ <translation>依大小&amp;排序</translation>
+ </message>
+ <message>
+ <source>Sort by &amp;Date</source>
+ <translation>依日期&amp;排序</translation>
+ </message>
+ <message>
+ <source>Sort by &amp;Name</source>
+ <translation>依名稱&amp;排序</translation>
+ </message>
+ <message>
+ <source>New Folder 1</source>
+ <translation>新資料夾 1</translation>
+ </message>
+ <message>
+ <source>the directory</source>
+ <translation>此目錄</translation>
+ </message>
+ <message>
+ <source>File &amp;type:</source>
+ <translation>檔案&amp;型態:</translation>
+ </message>
+ <message>
+ <source>File &amp;name:</source>
+ <translation>檔&amp;名:</translation>
+ </message>
+ <message>
+ <source>Delete %1</source>
+ <translation>刪除 %1</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>R&amp;eload</source>
+ <translation>重&amp;新載入</translation>
+ </message>
+ <message>
+ <source>New Folder</source>
+ <translation>新資料夾</translation>
+ </message>
+ <message>
+ <source>&amp;Unsorted</source>
+ <translation>未&amp;排序</translation>
+ </message>
+ <message>
+ <source>Look &amp;in:</source>
+ <translation>尋找&amp;於:</translation>
+ </message>
+ <message>
+ <source>Preview File Contents</source>
+ <translation>預覽檔案內容</translation>
+ </message>
+ <message>
+ <source>New Folder %1</source>
+ <translation>新資料夾 %1</translation>
+ </message>
+ <message>
+ <source>Read-write</source>
+ <translation>可讀寫</translation>
+ </message>
+ <message>
+ <source>Read-only</source>
+ <translation>唯讀</translation>
+ </message>
+ <message>
+ <source>Copy or Move a File</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>
+ </message>
+ <message>
+ <source>Find Directory</source>
+ <translation>尋找目錄</translation>
+ </message>
+ <message>
+ <source>Attributes</source>
+ <translation>屬性</translation>
+ </message>
+ <message>
+ <source>Show &amp;hidden files</source>
+ <translation>顯示&amp;隱藏檔</translation>
+ </message>
+ <message>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
+ </message>
+ <message>
+ <source>Inaccessible</source>
+ <translation>無法存取</translation>
+ </message>
+ <message>
+ <source>%1
+File not found.
+Check path and filename.</source>
+ <translation>%1
+找不到檔案。
+請檢查路徑與檔名。</translation>
+ </message>
+ <message>
+ <source>List View</source>
+ <translation>列表檢視</translation>
+ </message>
+ <message>
+ <source>Special</source>
+ <translation>特殊節點</translation>
+ </message>
+ <message>
+ <source>Write-only</source>
+ <translation>唯寫</translation>
+ </message>
+ <message>
+ <source>the symlink</source>
+ <translation>此符號連結</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;刪除</translation>
+ </message>
+ <message>
+ <source>All Files (*)</source>
+ <translation>所有檔案 (*)</translation>
+ </message>
+ <message>
+ <source>Directories</source>
+ <translation>目錄</translation>
+ </message>
+ <message>
+ <source>Symlink to Special</source>
+ <translation>到特殊節點的符號連結</translation>
+ </message>
+ <message>
+ <source>Select a Directory</source>
+ <translation>請選擇一個目錄</translation>
+ </message>
+ <message>
+ <source>All Files (*.*)</source>
+ <translation>所有檔案 (*.*)</translation>
+ </message>
+ <message>
+ <source>Read: %1</source>
+ <translation>讀取：%1</translation>
+ </message>
+ <message>
+ <source>&amp;Rename</source>
+ <translation>&amp;重新命名</translation>
+ </message>
+ <message>
+ <source>Directory:</source>
+ <translation>目錄:</translation>
+ </message>
+ <message>
+ <source>One directory up</source>
+ <translation>往上一層目錄</translation>
+ </message>
+ <message>
+ <source>Preview File Info</source>
+ <translation>預覽檔案資訊</translation>
+ </message>
+ <message>
+ <source>the file</source>
+ <translation>此檔案</translation>
+ </message>
+ <message>
+ <source>Create New Folder</source>
+ <translation>建立新資料夾</translation>
+ </message>
+ <message>
+ <source>Symlink to File</source>
+ <translation>到檔案的符號連結</translation>
+ </message>
+ <message>
+ <source>Symlink to Directory</source>
+ <translation>到目錄的符號連結</translation>
+ </message>
+ <message>
+ <source>Detail View</source>
+ <translation>詳細檢視</translation>
+ </message>
+</context>
+<context>
+ <name>QErrorMessage</name>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;確定</translation>
+ </message>
+ <message>
+ <source>Fatal Error:</source>
+ <translation>嚴重錯誤:</translation>
+ </message>
+ <message>
+ <source>&amp;Show this message again</source>
+ <translation>&amp;再度顯示此訊息</translation>
+ </message>
+ <message>
+ <source>Debug Message:</source>
+ <translation>除錯訊息:</translation>
+ </message>
+ <message>
+ <source>Warning:</source>
+ <translation>警告:</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintWidget</name>
+ <message>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <source>Form</source>
+ <translation>表單</translation>
+ </message>
+ <message>
+ <source>Type:</source>
+ <translation>型態:</translation>
+ </message>
+ <message>
+ <source>&amp;Name:</source>
+ <translation>&amp;名稱:</translation>
+ </message>
+ <message>
+ <source>Output &amp;file:</source>
+ <translation>&amp;輸出檔案:</translation>
+ </message>
+ <message>
+ <source>P&amp;roperties</source>
+ <translation>屬&amp;性</translation>
+ </message>
+ <message>
+ <source>Preview</source>
+ <translation>預覽</translation>
+ </message>
+ <message>
+ <source>Printer</source>
+ <translation>印表機</translation>
+ </message>
+ <message>
+ <source>Location:</source>
+ <translation>位置:</translation>
+ </message>
+</context>
+<context>
+ <name>QFontDatabase</name>
+ <message>
+ <source>Any</source>
+ <translation>任何</translation>
+ </message>
+ <message>
+ <source>Lao</source>
+ <translation>寮國</translation>
+ </message>
+ <message>
+ <source>Bold</source>
+ <translation>粗體</translation>
+ </message>
+ <message>
+ <source>Demi</source>
+ <translation>半體</translation>
+ </message>
+ <message>
+ <source>Thai</source>
+ <translation>泰語</translation>
+ </message>
+ <message>
+ <source>Black</source>
+ <translation>黑體</translation>
+ </message>
+ <message>
+ <source>Greek</source>
+ <translation>希臘</translation>
+ </message>
+ <message>
+ <source>Khmer</source>
+ <translation>高棉</translation>
+ </message>
+ <message>
+ <source>Latin</source>
+ <translation>拉丁</translation>
+ </message>
+ <message>
+ <source>Light</source>
+ <translation>輕體</translation>
+ </message>
+ <message>
+ <source>Ogham</source>
+ <translation>歐甘</translation>
+ </message>
+ <message>
+ <source>Oriya</source>
+ <translation>Oriya</translation>
+ </message>
+ <message>
+ <source>Runic</source>
+ <translation>盧恩</translation>
+ </message>
+ <message>
+ <source>Tamil</source>
+ <translation>坦米爾</translation>
+ </message>
+ <message>
+ <source>Cyrillic</source>
+ <translation>斯拉夫</translation>
+ </message>
+ <message>
+ <source>Kannada</source>
+ <translation>坎達那</translation>
+ </message>
+ <message>
+ <source>Malayalam</source>
+ <translation>馬來語</translation>
+ </message>
+ <message>
+ <source>Simplified Chinese</source>
+ <translation>簡體中文</translation>
+ </message>
+ <message>
+ <source>Demi Bold</source>
+ <translation>半粗體</translation>
+ </message>
+ <message>
+ <source>Arabic</source>
+ <translation>阿拉伯</translation>
+ </message>
+ <message>
+ <source>Hebrew</source>
+ <translation>希伯來</translation>
+ </message>
+ <message>
+ <source>Myanmar</source>
+ <translation>緬甸</translation>
+ </message>
+ <message>
+ <source>Italic</source>
+ <translation>斜體</translation>
+ </message>
+ <message>
+ <source>Korean</source>
+ <translation>韓語</translation>
+ </message>
+ <message>
+ <source>Normal</source>
+ <translation>正常</translation>
+ </message>
+ <message>
+ <source>Oblique</source>
+ <translation>傾斜體</translation>
+ </message>
+ <message>
+ <source>Telugu</source>
+ <translation>Telugu</translation>
+ </message>
+ <message>
+ <source>Thaana</source>
+ <translation>Thaana</translation>
+ </message>
+ <message>
+ <source>Symbol</source>
+ <translation>符號</translation>
+ </message>
+ <message>
+ <source>Syriac</source>
+ <translation>敘利亞</translation>
+ </message>
+ <message>
+ <source>Devanagari</source>
+ <translation>Devanagari</translation>
+ </message>
+ <message>
+ <source>Japanese</source>
+ <translation>日語</translation>
+ </message>
+ <message>
+ <source>Bengali</source>
+ <translation>孟加拉</translation>
+ </message>
+ <message>
+ <source>Armenian</source>
+ <translation>亞美尼亞</translation>
+ </message>
+ <message>
+ <source>Sinhala</source>
+ <translation>錫蘭</translation>
+ </message>
+ <message>
+ <source>Tibetan</source>
+ <translation>西藏</translation>
+ </message>
+ <message>
+ <source>Vietnamese</source>
+ <translation>越南</translation>
+ </message>
+ <message>
+ <source>Gujarati</source>
+ <translation>Gujarati</translation>
+ </message>
+ <message>
+ <source>Traditional Chinese</source>
+ <translation>繁體中文</translation>
+ </message>
+ <message>
+ <source>Georgian</source>
+ <translation>喬治亞</translation>
+ </message>
+ <message>
+ <source>Gurmukhi</source>
+ <translation>Gurmukhi</translation>
+ </message>
+</context>
+<context>
+ <name>QWebPage</name>
+ <message>
+ <source>Cut</source>
+ <translation>剪下</translation>
+ </message>
+ <message>
+ <source>LTR</source>
+ <translation>左到右</translation>
+ </message>
+ <message>
+ <source>RTL</source>
+ <translation>右到左</translation>
+ </message>
+ <message>
+ <source>Top</source>
+ <translation>頂端</translation>
+ </message>
+ <message>
+ <source>Bold</source>
+ <translation>粗體</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation>複製</translation>
+ </message>
+ <message>
+ <source>Stop</source>
+ <translation>停止</translation>
+ </message>
+ <message>
+ <source>Open Frame</source>
+ <translation>開啟框架</translation>
+ </message>
+ <message>
+ <source>Open Image</source>
+ <translation>開啟影像</translation>
+ </message>
+ <message>
+ <source>Fonts</source>
+ <translation>字型</translation>
+ </message>
+ <message>
+ <source>Paste</source>
+ <translation>貼上</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>重置</translation>
+ </message>
+ <message>
+ <source>Inspect</source>
+ <translation>查驗</translation>
+ </message>
+ <message>
+ <source>Select to the start of the block</source>
+ <translation>選擇到這一個區塊的起頭</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the end of the block</source>
+ <translation>移動游標到這一個區塊的結尾</translation>
+ </message>
+ <message>
+ <source>Select to the start of the line</source>
+ <translation>選擇到這一行的起頭</translation>
+ </message>
+ <message>
+ <source>Look Up In Dictionary</source>
+ <translation>在字典裡搜尋</translation>
+ </message>
+ <message>
+ <source>Search The Web</source>
+ <translation>搜尋站台</translation>
+ </message>
+ <message>
+ <source>Check Spelling While Typing</source>
+ <translation>打字時立即檢查拼字</translation>
+ </message>
+ <message>
+ <source>Add To Dictionary</source>
+ <translation>新增到字典</translation>
+ </message>
+ <message>
+ <source>Delete to the start of the word</source>
+ <translation>刪除到此單字的起頭</translation>
+ </message>
+ <message>
+ <source>Recent searches</source>
+ <translation>最近的搜尋</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the next word</source>
+ <translation>移動游標到下一個單字</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the next line</source>
+ <translation>移動游標到下一行</translation>
+ </message>
+ <message>
+ <source>JavaScript Alert - %1</source>
+ <translation>JavaScript 警告 ─ %1</translation>
+ </message>
+ <message>
+ <source>Scroll down</source>
+ <translation>往下捲軸</translation>
+ </message>
+ <message>
+ <source>Scroll here</source>
+ <translation>在此捲軸</translation>
+ </message>
+ <message>
+ <source>Scroll left</source>
+ <translation>往左捲軸</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the start of the block</source>
+ <translation>移動游標到這一個區塊的起頭</translation>
+ </message>
+ <message>
+ <source>Text Direction</source>
+ <translation>文字方向</translation>
+ </message>
+ <message>
+ <source>Bottom</source>
+ <translation>底端</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <source>Italic</source>
+ <translation>斜體</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the end of the line</source>
+ <translation>移動游標到這一行的結尾</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the start of the line</source>
+ <translation>移動游標到這一行的起頭</translation>
+ </message>
+ <message>
+ <source>Reload</source>
+ <translation>重新載入</translation>
+ </message>
+ <message>
+ <source>JavaScript Confirm - %1</source>
+ <translation>JavaScript 確認 ─ %1</translation>
+ </message>
+ <message>
+ <source>Submit</source>
+ <translation>提交</translation>
+ </message>
+ <message>
+ <source>Web Inspector - %2</source>
+ <translation>網站查驗器─%2</translation>
+ </message>
+ <message>
+ <source>Page up</source>
+ <translation>頁面上方</translation>
+ </message>
+ <message>
+ <source>Spelling</source>
+ <translation>拼字</translation>
+ </message>
+ <message>
+ <source>Outline</source>
+ <translation>外框線</translation>
+ </message>
+ <message>
+ <source>Check Grammar With Spelling</source>
+ <translation>檢查拼字與文法</translation>
+ </message>
+ <message>
+ <source>No file selected</source>
+ <translation>未選取任何檔案</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <comment>Ignore Grammar context menu item</comment>
+ <translation>忽略</translation>
+ </message>
+ <message>
+ <source>Save Image</source>
+ <translation>儲存影像</translation>
+ </message>
+ <message>
+ <source>Save Link...</source>
+ <translation>儲存連結...</translation>
+ </message>
+ <message>
+ <source>No recent searches</source>
+ <translation>沒有最近的搜尋</translation>
+ </message>
+ <message>
+ <source>Page right</source>
+ <translation>頁面右方</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the start of the document</source>
+ <translation>移動游標到這一個文件的起頭</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the next character</source>
+ <translation>移動游標到下一個字元</translation>
+ </message>
+ <message>
+ <source>JavaScript Prompt - %1</source>
+ <translation>JavaScript 提示 ─ %1</translation>
+ </message>
+ <message>
+ <source>Copy Link</source>
+ <translation>複製連結</translation>
+ </message>
+ <message>
+ <source>Select to the previous line</source>
+ <translation>選擇到前一行</translation>
+ </message>
+ <message>
+ <source>Select to the previous word</source>
+ <translation>選擇到前一個單字</translation>
+ </message>
+ <message>
+ <source>Check Spelling</source>
+ <translation>檢查拼字</translation>
+ </message>
+ <message>
+ <source>Select to the next character</source>
+ <translation>選擇到下一個字元</translation>
+ </message>
+ <message>
+ <source>Show Spelling and Grammar</source>
+ <translation>顯示拼字與文法</translation>
+ </message>
+ <message>
+ <source>Delete to the end of the word</source>
+ <translation>刪除到此單字的結尾</translation>
+ </message>
+ <message>
+ <source>Direction</source>
+ <translation>方向</translation>
+ </message>
+ <message>
+ <source>Select to the end of the line</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>
+ </message>
+ <message>
+ <source>Choose File</source>
+ <translation>選擇檔案</translation>
+ </message>
+ <message>
+ <source>Scroll up</source>
+ <translation>往上捲軸</translation>
+ </message>
+ <message>
+ <source>Clear recent searches</source>
+ <translation>清除最近的搜尋</translation>
+ </message>
+ <message>
+ <source>Select to the start of the document</source>
+ <translation>選擇到這一個文件的起頭</translation>
+ </message>
+ <message>
+ <source>Default</source>
+ <translation>預設</translation>
+ </message>
+ <message>
+ <source>Underline</source>
+ <translation>底線</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the previous character</source>
+ <translation>移動游標到前一個字元</translation>
+ </message>
+ <message>
+ <source>Copy Image</source>
+ <translation>複製影像</translation>
+ </message>
+ <message>
+ <source>Select to the end of the document</source>
+ <translation>選擇到這一個文件的結尾</translation>
+ </message>
+ <message>
+ <source>Select to the end of the block</source>
+ <translation>選擇到這一個區塊的結尾</translation>
+ </message>
+ <message>
+ <source>Scroll right</source>
+ <translation>往右捲軸</translation>
+ </message>
+ <message>
+ <source>No Guesses Found</source>
+ <translation>找不到可能的內容</translation>
+ </message>
+ <message>
+ <source>Open Link</source>
+ <translation>開啟連結</translation>
+ </message>
+ <message>
+ <source>Bad HTTP request</source>
+ <translation>不良的 HTTP 請求</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the previous word</source>
+ <translation>移動游標到前一個單字</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the previous line</source>
+ <translation>移動游標到前一行</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n file(s)</source>
+ <translation>
+ <numerusform>%n 個檔案</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Left edge</source>
+ <translation>左邊緣</translation>
+ </message>
+ <message>
+ <source>Go Forward</source>
+ <translation>往前</translation>
+ </message>
+ <message>
+ <source>Page down</source>
+ <translation>頁面下方</translation>
+ </message>
+ <message>
+ <source>Page left</source>
+ <translation>頁面左方</translation>
+ </message>
+ <message>
+ <source>This is a searchable index. Enter search keywords: </source>
+ <translation>這是可搜尋的索引。請輸入關鍵字: </translation>
+ </message>
+ <message>
+ <source>Select to the previous character</source>
+ <translation>選擇到前一個字元</translation>
+ </message>
+ <message>
+ <source>Go Back</source>
+ <translation>往回</translation>
+ </message>
+ <message>
+ <source>Open in New Window</source>
+ <translation>在新視窗開啟</translation>
+ </message>
+ <message>
+ <source>Right edge</source>
+ <translation>右邊緣</translation>
+ </message>
+ <message>
+ <source>Move the cursor to the end of the document</source>
+ <translation>移動游標到這一個文件的結尾</translation>
+ </message>
+ <message>
+ <source>Hide Spelling and Grammar</source>
+ <translation>隱藏拼字與文法</translation>
+ </message>
+ <message>
+ <source>%1 (%2x%3 pixels)</source>
+ <translation>%1（%2x%3 像素）</translation>
+ </message>
+ <message>
+ <source>Select to the next word</source>
+ <translation>選擇到下一個單字</translation>
+ </message>
+ <message>
+ <source>Select to the next line</source>
+ <translation>選擇到下一行</translation>
+ </message>
+</context>
+<context>
+ <name>QScrollBar</name>
+ <message>
+ <source>Top</source>
+ <translation>頂端</translation>
+ </message>
+ <message>
+ <source>Scroll down</source>
+ <translation>往下捲軸</translation>
+ </message>
+ <message>
+ <source>Scroll here</source>
+ <translation>在此捲軸</translation>
+ </message>
+ <message>
+ <source>Scroll left</source>
+ <translation>往左捲軸</translation>
+ </message>
+ <message>
+ <source>Line up</source>
+ <translation>對上排列</translation>
+ </message>
+ <message>
+ <source>Line down</source>
+ <translation>對下排列</translation>
+ </message>
+ <message>
+ <source>Bottom</source>
+ <translation>底端</translation>
+ </message>
+ <message>
+ <source>Page up</source>
+ <translation>頁面上方</translation>
+ </message>
+ <message>
+ <source>Position</source>
+ <translation>位置</translation>
+ </message>
+ <message>
+ <source>Page right</source>
+ <translation>頁面右方</translation>
+ </message>
+ <message>
+ <source>Scroll up</source>
+ <translation>往上捲軸</translation>
+ </message>
+ <message>
+ <source>Scroll right</source>
+ <translation>往右捲軸</translation>
+ </message>
+ <message>
+ <source>Left edge</source>
+ <translation>左邊緣</translation>
+ </message>
+ <message>
+ <source>Page down</source>
+ <translation>頁面下方</translation>
+ </message>
+ <message>
+ <source>Page left</source>
+ <translation>頁面左方</translation>
+ </message>
+ <message>
+ <source>Right edge</source>
+ <translation>右邊緣</translation>
+ </message>
+</context>
+<context>
+ <name>QInputContext</name>
+ <message>
+ <source>XIM</source>
+ <translation>XIM</translation>
+ </message>
+ <message>
+ <source>Windows input method</source>
+ <translation>Windows 輸入法</translation>
+ </message>
+ <message>
+ <source>XIM input method</source>
+ <translation>XIM 輸入法</translation>
+ </message>
+ <message>
+ <source>Mac OS X input method</source>
+ <translation>Mac OS X 輸入法</translation>
+ </message>
+</context>
+<context>
+ <name>QFileDialog</name>
+ <message>
+ <source>Back</source>
+ <translation>返回</translation>
+ </message>
+ <message>
+ <source>File</source>
+ <translation>檔案</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>開啟</translation>
+ </message>
+ <message>
+ <source>&amp;Open</source>
+ <translation>&amp;開啟</translation>
+ </message>
+ <message>
+ <source>&amp;Save</source>
+ <translation>&amp;儲存</translation>
+ </message>
+ <message>
+ <source>Drive</source>
+ <translation>磁碟</translation>
+ </message>
+ <message>
+ <source>Show </source>
+ <translation>顯示 </translation>
+ </message>
+ <message>
+ <source>&apos;%1&apos; is write protected.
+Do you want to delete it anyway?</source>
+ <translation>&apos;%1&apos; 有寫入保護。
+您確定要刪除它嗎?</translation>
+ </message>
+ <message>
+ <source>File &amp;name:</source>
+ <translation>檔&amp;名:</translation>
+ </message>
+ <message>
+ <source>New Folder</source>
+ <translation>新資料夾</translation>
+ </message>
+ <message>
+ <source>Parent Directory</source>
+ <translation>父目錄</translation>
+ </message>
+ <message>
+ <source>&amp;New Folder</source>
+ <translation>&amp;新增資料夾</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>移除</translation>
+ </message>
+ <message>
+ <source>My Computer</source>
+ <translation>我的電腦</translation>
+ </message>
+ <message>
+ <source>Look in:</source>
+ <translation>尋找:</translation>
+ </message>
+ <message>
+ <source>Files of type:</source>
+ <translation>檔案型態:</translation>
+ </message>
+ <message>
+ <source>Find Directory</source>
+ <translation>尋找目錄</translation>
+ </message>
+ <message>
+ <source>Show &amp;hidden files</source>
+ <translation>顯示&amp;隱藏檔</translation>
+ </message>
+ <message>
+ <source>Are sure you want to delete &apos;%1&apos;?</source>
+ <translation>您確定要刪除&apos;%1&apos;</translation>
+ </message>
+ <message>
+ <source>Save As</source>
+ <translation>另存新檔</translation>
+ </message>
+ <message>
+ <source>%1
+Directory not found.
+Please verify the correct directory name was given.</source>
+ <translation>%1
+找不到目錄。
+請檢查目錄名稱是否正確。</translation>
+ </message>
+ <message>
+ <source>List View</source>
+ <translation>列表檢視</translation>
+ </message>
+ <message>
+ <source>&amp;Choose</source>
+ <translation>&amp;選擇</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;刪除</translation>
+ </message>
+ <message>
+ <source>All Files (*)</source>
+ <translation>所有檔案 (*)</translation>
+ </message>
+ <message>
+ <source>Directories</source>
+ <translation>目錄</translation>
+ </message>
+ <message>
+ <source>All Files (*.*)</source>
+ <translation>所有檔案 (*.*)</translation>
+ </message>
+ <message>
+ <source>&amp;Rename</source>
+ <translation>&amp;重新命名</translation>
+ </message>
+ <message>
+ <source>Could not delete directory.</source>
+ <translation>無法刪除目錄。</translation>
+ </message>
+ <message>
+ <source>Directory:</source>
+ <translation>目錄:</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>未知</translation>
+ </message>
+ <message>
+ <source>%1 already exists.
+Do you want to replace it?</source>
+ <translation>%1 已存在
+您要取代它嗎?</translation>
+ </message>
+ <message>
+ <source>Forward</source>
+ <translation>往前</translation>
+ </message>
+ <message>
+ <source>Recent Places</source>
+ <translation>最近的地方</translation>
+ </message>
+ <message>
+ <source>Create New Folder</source>
+ <translation>建立新資料夾</translation>
+ </message>
+ <message>
+ <source>Detail View</source>
+ <translation>詳細檢視</translation>
+ </message>
+ <message>
+ <source>%1
+File not found.
+Please verify the correct file name was given.</source>
+ <translation>%1
+找不到檔案。
+請檢查檔名是否正確。</translation>
+ </message>
+</context>
+<context>
+ <name>Q3TextEdit</name>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>剪&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;複製</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>&amp;重做</translation>
+ </message>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>&amp;復原</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>清除</translation>
+ </message>
+ <message>
+ <source>Paste</source>
+ <translation>貼上</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全部選擇</translation>
+ </message>
+</context>
+<context>
+ <name>QLineEdit</name>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>剪&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;複製</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>&amp;重做</translation>
+ </message>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>&amp;復原</translation>
+ </message>
+ <message>
+ <source>&amp;Paste</source>
+ <translation>&amp;貼上</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全部選擇</translation>
+ </message>
+</context>
+<context>
+ <name>QTextControl</name>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>剪&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;複製</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>&amp;重做</translation>
+ </message>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>&amp;復原</translation>
+ </message>
+ <message>
+ <source>&amp;Paste</source>
+ <translation>&amp;貼上</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全部選擇</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Link Location</source>
+ <translation>複製&amp;連結位址</translation>
+ </message>
+</context>
+<context>
+ <name>QDockWidget</name>
+ <message>
+ <source>Dock</source>
+ <translation>嵌入</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>Float</source>
+ <translation>飄浮</translation>
+ </message>
+</context>
+<context>
+ <name>QDialog</name>
+ <message>
+ <source>Done</source>
+ <translation>完成</translation>
+ </message>
+ <message>
+ <source>What&apos;s This?</source>
+ <translation>這是&apos;什麼?</translation>
+ </message>
+</context>
+<context>
+ <name>QWizard</name>
+ <message>
+ <source>Done</source>
+ <translation>完成</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>說明</translation>
+ </message>
+ <message>
+ <source>&amp;Help</source>
+ <translation>&amp;說明</translation>
+ </message>
+ <message>
+ <source>&amp;Next</source>
+ <translation>&amp;下一個</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+ <message>
+ <source>Commit</source>
+ <translation>提交</translation>
+ </message>
+ <message>
+ <source>Continue</source>
+ <translation>繼續</translation>
+ </message>
+ <message>
+ <source>&amp;Finish</source>
+ <translation>&amp;完成</translation>
+ </message>
+ <message>
+ <source>&amp;Next &gt;</source>
+ <translation>&amp;下一個 &gt;＞</translation>
+ </message>
+ <message>
+ <source>Go Back</source>
+ <translation>往回</translation>
+ </message>
+ <message>
+ <source>&lt; &amp;Back</source>
+ <translation>＜&lt; &amp;返回</translation>
+ </message>
+</context>
+<context>
+ <name>QPageSetupWidget</name>
+ <message>
+ <source>Form</source>
+ <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>
+ </message>
+ <message>
+ <source>Centimeters (cm)</source>
+ <translation>公分</translation>
+ </message>
+ <message>
+ <source>right margin</source>
+ <translation>右緣</translation>
+ </message>
+ <message>
+ <source>Margins</source>
+ <translation>邊緣</translation>
+ </message>
+ <message>
+ <source>Landscape</source>
+ <translation>橫向</translation>
+ </message>
+ <message>
+ <source>Width:</source>
+ <translation>寬度:</translation>
+ </message>
+ <message>
+ <source>Orientation</source>
+ <translation>方向</translation>
+ </message>
+ <message>
+ <source>Portrait</source>
+ <translation>縱向</translation>
+ </message>
+ <message>
+ <source>top margin</source>
+ <translation>上緣</translation>
+ </message>
+ <message>
+ <source>left margin</source>
+ <translation>左緣</translation>
+ </message>
+ <message>
+ <source>Page size:</source>
+ <translation>紙張大小:</translation>
+ </message>
+ <message>
+ <source>Reverse portrait</source>
+ <translation>反序縱向</translation>
+ </message>
+ <message>
+ <source>Millimeters (mm)</source>
+ <translation>公厘</translation>
+ </message>
+ <message>
+ <source>Points (pt)</source>
+ <translation>點</translation>
+ </message>
+ <message>
+ <source>Inches (in)</source>
+ <translation>英吋</translation>
+ </message>
+ <message>
+ <source>Reverse landscape</source>
+ <translation>反序橫向</translation>
+ </message>
+ <message>
+ <source>Height:</source>
+ <translation>高度:</translation>
+ </message>
+</context>
+<context>
+ <name>QPrintPropertiesWidget</name>
+ <message>
+ <source>Form</source>
+ <translation>表單</translation>
+ </message>
+ <message>
+ <source>Page</source>
+ <translation>頁面</translation>
+ </message>
+ <message>
+ <source>Advanced</source>
+ <translation>進階</translation>
+ </message>
+</context>
+<context>
+ <name>QMdiSubWindow</name>
+ <message>
+ <source>Help</source>
+ <translation>說明</translation>
+ </message>
+ <message>
+ <source>Menu</source>
+ <translation>選單</translation>
+ </message>
+ <message>
+ <source>&amp;Move</source>
+ <translation>&amp;移動</translation>
+ </message>
+ <message>
+ <source>&amp;Size</source>
+ <translation>&amp;大小</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>Minimize</source>
+ <translation>最小化</translation>
+ </message>
+ <message>
+ <source>Shade</source>
+ <translation>遮蔽</translation>
+ </message>
+ <message>
+ <source>Stay on &amp;Top</source>
+ <translation>留在&amp;頂端</translation>
+ </message>
+ <message>
+ <source>&amp;Close</source>
+ <translation>&amp;關閉</translation>
+ </message>
+ <message>
+ <source>- [%1]</source>
+ <translation>- [%1]</translation>
+ </message>
+ <message>
+ <source>%1 - [%2]</source>
+ <translation>%1 - [%2]</translation>
+ </message>
+ <message>
+ <source>&amp;Restore</source>
+ <translation>&amp;回復</translation>
+ </message>
+ <message>
+ <source>Restore</source>
+ <translation>回復</translation>
+ </message>
+ <message>
+ <source>Maximize</source>
+ <translation>最大化</translation>
+ </message>
+ <message>
+ <source>Unshade</source>
+ <translation>取消遮蔽</translation>
+ </message>
+ <message>
+ <source>Mi&amp;nimize</source>
+ <translation>最小&amp;化</translation>
+ </message>
+ <message>
+ <source>Ma&amp;ximize</source>
+ <translation>最大&amp;化</translation>
+ </message>
+ <message>
+ <source>Restore Down</source>
+ <translation>向下恢復</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <source>Home</source>
+ <translation>首頁</translation>
+ </message>
+ <message>
+ <source>Protocol error: packet of size 0 received</source>
+ <translation>協定錯誤：接收到大小為 0 的封包</translation>
+ </message>
+ <message>
+ <source>Invalid URI: %1</source>
+ <translation>不合法的網址：%1</translation>
+ </message>
+ <message>
+ <source>Socket error on %1: %2</source>
+ <translation>%1 上發生 socket 錯誤：%2</translation>
+ </message>
+ <message>
+ <source>No host name given</source>
+ <translation>未指定主機</translation>
+ </message>
+ <message>
+ <source>Read error reading from %1: %2</source>
+ <translation>從 %1 讀取錯誤：%2</translation>
+ </message>
+ <message>
+ <source>Remote host closed the connection prematurely on %1</source>
+ <translation>於 %1 上遠端主機關閉了不正常的連線</translation>
+ </message>
+ <message>
+ <source>Operation not supported on %1</source>
+ <translation>在 %1 上不支援此操作</translation>
+ </message>
+ <message>
+ <source>Write error writing to %1: %2</source>
+ <translation>寫入 %1 時發生錯誤：%2</translation>
+ </message>
+</context>
+<context>
+ <name>QDirModel</name>
+ <message>
+ <source>Kind</source>
+ <translation>種類</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>名稱</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>大小</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>型態</translation>
+ </message>
+ <message>
+ <source>Date Modified</source>
+ <translation>變更日期</translation>
+ </message>
+</context>
+<context>
+ <name>QFileSystemModel</name>
+ <message>
+ <source>Kind</source>
+ <translation>種類</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>名稱</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>大小</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>型態</translation>
+ </message>
+ <message>
+ <source>%1 GB</source>
+ <translation>%1 GB</translation>
+ </message>
+ <message>
+ <source>%1 KB</source>
+ <translation>%1 KB</translation>
+ </message>
+ <message>
+ <source>%1 MB</source>
+ <translation>%1 MB</translation>
+ </message>
+ <message>
+ <source>%1 TB</source>
+ <translation>%1 TB</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>
+ </message>
+ <message>
+ <source>%1 bytes</source>
+ <translation>%1 位元組</translation>
+ </message>
+ <message>
+ <source>My Computer</source>
+ <translation>我的電腦</translation>
+ </message>
+ <message>
+ <source>Computer</source>
+ <translation>電腦</translation>
+ </message>
+ <message>
+ <source>Invalid filename</source>
+ <translation>不合法的檔名</translation>
+ </message>
+ <message>
+ <source>Date Modified</source>
+ <translation>變更日期</translation>
+ </message>
+</context>
+<context>
+ <name>QDoubleSpinBox</name>
+ <message>
+ <source>Less</source>
+ <translation>較少</translation>
+ </message>
+ <message>
+ <source>More</source>
+ <translation>更多</translation>
+ </message>
+</context>
+<context>
+ <name>QSpinBox</name>
+ <message>
+ <source>Less</source>
+ <translation>較少</translation>
+ </message>
+ <message>
+ <source>More</source>
+ <translation>更多</translation>
+ </message>
+</context>
+<context>
+ <name>QPPDOptionsModel</name>
+ <message>
+ <source>Name</source>
+ <translation>名稱</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation>值</translation>
+ </message>
+</context>
+<context>
+ <name>QComboBox</name>
+ <message>
+ <source>Open</source>
+ <translation>開啟</translation>
+ </message>
+ <message>
+ <source>True</source>
+ <translation>真</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>False</source>
+ <translation>假</translation>
+ </message>
+</context>
+<context>
+ <name>QMenu</name>
+ <message>
+ <source>Open</source>
+ <translation>開啟</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>Execute</source>
+ <translation>執行</translation>
+ </message>
+</context>
+<context>
+ <name>QPushButton</name>
+ <message>
+ <source>Open</source>
+ <translation>開啟</translation>
+ </message>
+</context>
+<context>
+ <name>QToolButton</name>
+ <message>
+ <source>Open</source>
+ <translation>開啟</translation>
+ </message>
+ <message>
+ <source>Press</source>
+ <translation>按下</translation>
+ </message>
+</context>
+<context>
+ <name>QUndoGroup</name>
+ <message>
+ <source>Redo</source>
+ <translation>重做</translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation>復原</translation>
+ </message>
+</context>
+<context>
+ <name>QUndoStack</name>
+ <message>
+ <source>Redo</source>
+ <translation>重做</translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation>復原</translation>
+ </message>
+</context>
+<context>
+ <name>Q3DataTable</name>
+ <message>
+ <source>True</source>
+ <translation>真</translation>
+ </message>
+ <message>
+ <source>False</source>
+ <translation>假</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <source>Insert</source>
+ <translation>插入</translation>
+ </message>
+ <message>
+ <source>Update</source>
+ <translation>更新</translation>
+ </message>
+</context>
+<context>
+ <name>QSslSocket</name>
+ <message>
+ <source>Error creating SSL session: %1</source>
+ <translation>建立 SSL 工作階段時發生錯誤：%1</translation>
+ </message>
+ <message>
+ <source>Error creating SSL session, %1</source>
+ <translation>建立 SSL 工作階段時發生錯誤：%1</translation>
+ </message>
+ <message>
+ <source>Cannot provide a certificate with no key, %1</source>
+ <translation>沒有金鑰無法提供憑證：%1</translation>
+ </message>
+ <message>
+ <source>Unable to write data: %1</source>
+ <translation>無法寫入資料：%1</translation>
+ </message>
+ <message>
+ <source>Error during SSL handshake: %1</source>
+ <translation>SSL 同步時發生錯誤：%1</translation>
+ </message>
+ <message>
+ <source>Error loading local certificate, %1</source>
+ <translation>載入本地憑證時發生錯誤：%1</translation>
+ </message>
+ <message>
+ <source>Invalid or empty cipher list (%1)</source>
+ <translation>不合法或空白的加密清單（%1）</translation>
+ </message>
+ <message>
+ <source>Private key does not certificate public key, %1</source>
+ <translation>私密金鑰無法認證公開金鑰，%1</translation>
+ </message>
+ <message>
+ <source>Error creating SSL context (%1)</source>
+ <translation>建立 SSL 內文時發生錯誤（%1）</translation>
+ </message>
+ <message>
+ <source>Error while reading: %1</source>
+ <translation>讀取時發生錯誤：%1</translation>
+ </message>
+ <message>
+ <source>Error loading private key, %1</source>
+ <translation>載入私鑰時發生錯誤：%1</translation>
+ </message>
+</context>
+<context>
+ <name>QLocalSocket</name>
+ <message>
+ <source>%1: Connection error</source>
+ <translation>%1：連線錯誤</translation>
+ </message>
+ <message>
+ <source>%1: Connection refused</source>
+ <translation>%1：連線被拒</translation>
+ </message>
+ <message>
+ <source>%1: Unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
+ </message>
+ <message>
+ <source>%1: Socket access error</source>
+ <translation>%1：Socket 位址錯誤</translation>
+ </message>
+ <message>
+ <source>%1: Socket resource error</source>
+ <translation>%1：Socket 資源錯誤</translation>
+ </message>
+ <message>
+ <source>%1: The socket operation is not supported</source>
+ <translation>%1：socket 操作未支援</translation>
+ </message>
+ <message>
+ <source>%1: Invalid name</source>
+ <translation>%1：不合法的名稱</translation>
+ </message>
+ <message>
+ <source>%1: Unknown error</source>
+ <translation>%1：未知的錯誤</translation>
+ </message>
+ <message>
+ <source>%1: Socket operation timed out</source>
+ <translation>%1：Socket 操作逾時</translation>
+ </message>
+ <message>
+ <source>%1: Datagram too large</source>
+ <translation>%1：資料包過大</translation>
+ </message>
+ <message>
+ <source>%1: Remote closed</source>
+ <translation>%1：遠端已關閉</translation>
+ </message>
+</context>
+<context>
+ <name>QtXmlPatterns</name>
+ <message>
+ <source>A comment cannot contain %1</source>
+ <translation>註解不能包含 %1</translation>
+ </message>
+ <message>
+ <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
+ <translation>版本 %1 未支援。支援的 XQuery 版本為 1.0。</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>
+ </message>
+ <message>
+ <source>The parameter %1 is required, but no corresponding %2 is supplied.</source>
+ <translation>需要參數 %1，但是沒有提供相關的 %2。</translation>
+ </message>
+ <message>
+ <source>Namespace declarations must occur before function, variable, and option declarations.</source>
+ <translation>命名空間宣告必須在函式、變數與選項宣告之前。</translation>
+ </message>
+ <message>
+ <source>empty</source>
+ <translation>空白</translation>
+ </message>
+ <message>
+ <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
+ <translation>要與前置字串 %1 結合的命名空間網址不能是空字串。</translation>
+ </message>
+ <message>
+ <source>A comment cannot end with a %1.</source>
+ <translation>註解不能以 %1 做結尾。</translation>
+ </message>
+ <message>
+ <source>Top level stylesheet elements must be in a non-null namespace, which %1 isn&apos;t.</source>
+ <translation>頂層樣式表元素必須是非空白的命名空間，而 %1 不是。</translation>
+ </message>
+ <message>
+ <source>Integer division (%1) by zero (%2) is undefined.</source>
+ <translation>整數除法 %1 除以零（%2）的行為未定義。</translation>
+ </message>
+ <message>
+ <source>A library module cannot be evaluated directly. It must be imported from a main module.</source>
+ <translation>不能直接計算函式模組。必須要從主模組匯入。</translation>
+ </message>
+ <message>
+ <source>Time %1:%2:%3.%4 is invalid.</source>
+ <translation>時間 %1:%2:%3.%4 不合法。</translation>
+ </message>
+ <message>
+ <source>Attribute %1 cannot appear on the element %2. Only the standard attributes can appear.</source>
+ <translation>屬性 %1 不能出現在元素 %2。只能有標準屬性。</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>
+ </message>
+ <message>
+ <source>Modulus division (%1) by zero (%2) is undefined.</source>
+ <translation>餘數除法 %1 除以零（%2）的行為未定義。</translation>
+ </message>
+ <message>
+ <source>No function with signature %1 is available</source>
+ <translation>沒有簽章為 %1 的函式可使用</translation>
+ </message>
+ <message>
+ <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
+ <translation>未支援 pragma 敘述。因次，必須有預設的敘述</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>
+ </message>
+ <message>
+ <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
+ <translation>在 %2 內的代碼點 %1（編碼 %3）是一個不合法的 XML 字元。</translation>
+ </message>
+ <message>
+ <source>Network timeout.</source>
+ <translation>網路逾時。</translation>
+ </message>
+ <message>
+ <source>No casting is possible with %1 as the target type.</source>
+ <translation>不能轉換到 %1 型態。</translation>
+ </message>
+ <message>
+ <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
+ <translation>機制匯入功能未支援，因此有 %1 個宣告無法達成。</translation>
+ </message>
+ <message>
+ <source>Attribute %1 and %2 are mutually exclusive.</source>
+ <translation>屬性 %1 與 %2 彼此互斥。</translation>
+ </message>
+ <message>
+ <source>Parse error: %1</source>
+ <translation>剖析錯誤：%1</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>
+ </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>
+ </message>
+ <message>
+ <source>At least one component must be present.</source>
+ <translation>必須表達至少一個組件。</translation>
+ </message>
+ <message>
+ <source>In a namespace constructor, the value for a namespace value cannot be an empty string.</source>
+ <translation>在命名空間建構子中，命名空間的值不能是空字串。</translation>
+ </message>
+ <message>
+ <source>An attribute by name %1 has already been created.</source>
+ <translation>名為 %1 的屬性已被建立。</translation>
+ </message>
+ <message>
+ <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
+ <translation>名稱為 %1 的參數已被宣告。每個參數名稱必須唯一。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
+ <translation>%1 是正規表示式中不合法的旗標。合法的旗標有:</translation>
+ </message>
+ <message>
+ <source>At least one %1-element must occur inside %2.</source>
+ <translation>至少一個元素 %1 要出現在 %2 之內。</translation>
+ </message>
+ <message>
+ <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source>
+ <translation>只支援 Unicode Codepoint Collation（%1）。%2 未支援。</translation>
+ </message>
+ <message>
+ <source>Matches are case insensitive</source>
+ <translation>比對為區分大小寫</translation>
+ </message>
+ <message>
+ <source>The name of an extension expression must be in a namespace.</source>
+ <translation>延伸敘述的名稱必須在命名空間內。</translation>
+ </message>
+ <message>
+ <source>Each name of a template parameter must be unique; %1 is duplicated.</source>
+ <translation>每個樣本參數的名稱必須唯一；%1 已經被使用。</translation>
+ </message>
+ <message>
+ <source>At least one mode must be specified in the %1-attribute on element %2.</source>
+ <translation>在元素 %2 的 %1 屬性中至少要指定一個模式。</translation>
+ </message>
+ <message>
+ <source>%1 matches newline characters</source>
+ <translation>%1 符合了換行字元</translation>
+ </message>
+ <message>
+ <source>Year %1 is invalid because it begins with %2.</source>
+ <translation>年份 %1 不合法，因為是從 %2 開始的。</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>
+ </message>
+ <message>
+ <source>Element %1 cannot have children.</source>
+ <translation>元素 %1 不能有子元素。</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>
+ </message>
+ <message>
+ <source>Only one %1-element can appear.</source>
+ <translation>只能出現一個元素 %1。</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>
+ </message>
+ <message>
+ <source>A positional predicate must evaluate to a single numeric value.</source>
+ <translation>位置謂詞必須能計算出單一的數值。</translation>
+ </message>
+ <message>
+ <source>Element %1 can&apos;t be serialized because it appears outside the document element.</source>
+ <translation>元素 %1 無法序列化，因為似乎是在文件元素之外。</translation>
+ </message>
+ <message>
+ <source>%1 and %2 match the start and end of a line.</source>
+ <translation>%1 與 %2 符合了一行的開始與結尾。</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>
+ </message>
+ <message>
+ <source>A stylesheet function must have a prefixed name.</source>
+ <translation>樣式表函式必須有前置名稱。</translation>
+ </message>
+ <message>
+ <source>%1 cannot be retrieved</source>
+ <translation>%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>
+ </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>
+ </message>
+ <message>
+ <source>The prefix %1 cannot be bound.</source>
+ <translation>前置字串 %1 不能被結合。</translation>
+ </message>
+ <message>
+ <source>The prefix must be a valid %1, which %2 is not.</source>
+ <translation>前置字串必須是合法的 %1，但 %2 不是。</translation>
+ </message>
+ <message>
+ <source>The keyword %1 cannot occur with any other mode name.</source>
+ <translation>關鍵字 %1 不能與任何其它模式名稱一起存在。</translation>
+ </message>
+ <message>
+ <source>Type error in cast, expected %1, received %2.</source>
+ <translation>轉換型態錯誤，應為 %1 但接收到 %2。</translation>
+ </message>
+ <message>
+ <source>%1 is not a valid numeric literal.</source>
+ <translation>%1 不是合法的數值。</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>
+ <message>
+ <source>Circularity detected</source>
+ <translation>偵測到環狀</translation>
+ </message>
+ <message>
+ <source>A variable by name %1 has already been declared.</source>
+ <translation>名為 %1 的變數已被宣告。</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>
+ </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>
+ </message>
+ <message>
+ <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
+ <translation>若元素 %1 沒有屬性 %2，則也不能有屬性 %3 或 %4。</translation>
+ </message>
+ <message>
+ <source>A function already exists with the signature %1.</source>
+ <translation>已經有簽章為 %1 的函式存在。</translation>
+ </message>
+ <message>
+ <source>When casting to %1 from %2, the source value cannot be %3.</source>
+ <translation>從 %2 轉換型態為 %1 的時候，來源數值不能是 %3。</translation>
+ </message>
+ <message>
+ <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
+ <translation>屬性元素 %1 無法序列化，因為似乎是在頂層。</translation>
+ </message>
+ <message>
+ <source>No comparisons can be done involving the type %1.</source>
+ <translation>包含型態 %1 時不能做比較。</translation>
+ </message>
+ <message>
+ <source>No value is available for the external variable by name %1.</source>
+ <translation>名為 %1 的外部變數沒有可用的值。</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>
+ </message>
+ <message>
+ <source>The item %1 did not match the required type %2.</source>
+ <translation>項目 %1 未符合需要的型態 %2。</translation>
+ </message>
+ <message>
+ <source>Element %1 cannot have a sequence constructor.</source>
+ <translation>元素 %1不能有序列建構子。</translation>
+ </message>
+ <message>
+ <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
+ <translation>當屬性 %1 出現在 %2 內時，不能使用序列建構子。</translation>
+ </message>
+ <message>
+ <source>one or more</source>
+ <translation>一個以上</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>
+ </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>
+ <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>
+ </message>
+ <message>
+ <source>The focus is undefined.</source>
+ <translation>焦點未定義。</translation>
+ </message>
+ <message>
+ <source>%1 is an unknown schema type.</source>
+ <translation>%1 是未知的機制型態。</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>
+ </message>
+ <message>
+ <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source>
+ <translation>在取代字串中，在未脫逸的情形下 %1 必須至少跟著一位數字。</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>
+ </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>
+ </message>
+ <message>
+ <source>The first operand in an integer division, %1, cannot be infinity (%2).</source>
+ <translation>整數除法的第一個運算對象 %1 不能是無限大（%2）。</translation>
+ </message>
+ <message>
+ <source>%1 is not a valid value of type %2.</source>
+ <translation>%1 不是合法的 %2 型態的值。</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>
+ </message>
+ <message>
+ <source>The variable %1 is unused</source>
+ <translation>變數 %1 未使用</translation>
+ </message>
+ <message>
+ <source>The %1-axis is unsupported in XQuery</source>
+ <translation>XQuery 中未支援 %1 軸</translation>
+ </message>
+ <message>
+ <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
+ <translation>直接元素建構器沒有完整產生。%1 以 %2 結束。</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>
+ </message>
+ <message>
+ <source>Attribute %1 cannot have the value %2.</source>
+ <translation>屬性 %1 的值不能為 %2。</translation>
+ </message>
+ <message>
+ <source>It will not be possible to retrieve %1.</source>
+ <translation>無法取得 %1。</translation>
+ </message>
+ <message>
+ <source>In an XSL-T pattern, function %1 cannot have a third argument.</source>
+ <translation>在 XSL-T 樣式內，函式 %1 的不能有第三個參數。</translation>
+ </message>
+ <message>
+ <source>The namespace URI in the name for a computed attribute cannot be %1.</source>
+ <translation>在已計算屬性的名稱的命名空間網址不能是 %1。</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>
+ </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>
+ </message>
+ <message>
+ <source>zero or one</source>
+ <translation>0 或 1 個</translation>
+ </message>
+ <message>
+ <source>No operand in an integer division, %1, can be %2.</source>
+ <translation>整數除法沒有運作對象，%1，可以是 %2。</translation>
+ </message>
+ <message>
+ <source>The element with local name %1 does not exist in XSL-T.</source>
+ <translation>有本地名稱 %1 的元素在 XSL-T 內不存在。</translation>
+ </message>
+ <message>
+ <source>Two namespace declaration attributes have the same name: %1.</source>
+ <translation>有兩個命名空間宣告的屬性有相同的名稱：%1。</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>
+ </message>
+ <message>
+ <source>%1 is an invalid %2</source>
+ <translation>%1 是不合法的 %2</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>
+ </message>
+ <message>
+ <source>Division (%1) by zero (%2) is undefined.</source>
+ <translation>除法 %1 除以零（%2）的行為未定義。</translation>
+ </message>
+ <message>
+ <source>No template by name %1 exists.</source>
+ <translation>沒有名為 %1 的樣本存在。</translation>
+ </message>
+ <message>
+ <source>The attribute %1 must appear on element %2.</source>
+ <translation>屬性 %1 必須在元素 %2 內出現。</translation>
+ </message>
+ <message>
+ <source>An attribute by name %1 has already appeared on this element.</source>
+ <translation>名為 %1 的屬性已出現在此元素。</translation>
+ </message>
+ <message>
+ <source>The default collection is undefined</source>
+ <translation>預設的收藏未定義</translation>
+ </message>
+ <message>
+ <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
+ <translation>只有前置字串 %1 能與 %2 結合。反之亦然。</translation>
+ </message>
+ <message>
+ <source>Value %1 of type %2 exceeds maximum (%3).</source>
+ <translation>型態 %2 的數值 %1 已超過最大值（%3）。</translation>
+ </message>
+ <message>
+ <source>Whitespace characters are removed, except when they appear in character classes</source>
+ <translation>空白字元已移除，除非它們出現在字元類別</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>
+ </message>
+ <message>
+ <source>Operator %1 cannot be used on type %2.</source>
+ <translation>操作元 %1 不能用於型態 %2。</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>
+ </message>
+ <message>
+ <source>The target namespace of a %1 cannot be empty.</source>
+ <translation>%1 的目標命名空間不能是空的。</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>
+ </message>
+ <message>
+ <source>%1 is an invalid namespace URI.</source>
+ <translation>%1 是不合法的命名空間網址。</translation>
+ </message>
+ <message>
+ <source>The attribute %1 cannot appear on %2, when it is a child of %3.</source>
+ <translation>屬性 %1 不能出現在 %2，因為它是 %3 的子元素。</translation>
+ </message>
+ <message>
+ <source>The attribute %1 can only appear on the first %2 element.</source>
+ <translation>屬性 %1 只能出現在前 %2 個元素內。</translation>
+ </message>
+ <message>
+ <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
+ <translation>元素 %1 必須至少有一個屬性 %2 或一個序列建構子。</translation>
+ </message>
+ <message>
+ <source>Module imports must occur before function, variable, and option declarations.</source>
+ <translation>模組匯入必須在函式、變數與選項宣告之前。</translation>
+ </message>
+ <message>
+ <source>Day %1 is outside the range %2..%3.</source>
+ <translation>日期 %1 已超出 %2 到 %3 的範圍。</translation>
+ </message>
+ <message>
+ <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
+ <translation>%1 包含了在要求的編碼 %2 內不允許的八進位值。</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>
+ </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>
+ </message>
+ <message>
+ <source>Text nodes are not allowed at this location.</source>
+ <translation>文字節點不能在此位置。</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>
+ </message>
+ <message>
+ <source>%1 is not a valid name for a processing-instruction.</source>
+ <translation>%1 不是處理指令的合法名稱。</translation>
+ </message>
+ <message>
+ <source>%1 was called.</source>
+ <translation>%1 已被呼叫。</translation>
+ </message>
+ <message>
+ <source>It&apos;s not possible to add attributes after any other kind of node.</source>
+ <translation>不能在&apos;任何其它種類的節點後面加入屬性。</translation>
+ </message>
+ <message>
+ <source>At least one %1-element must occur before %2.</source>
+ <translation>至少一個元素 %1 要出現在 %2 之前。</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>
+ </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>
+ </message>
+ <message>
+ <source>A parameter in a function cannot be declared to be a tunnel.</source>
+ <translation>函式內的參數不能被宣告為通道（tunnel）。</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>
+ </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>
+ </message>
+ <message>
+ <source>Day %1 is invalid for month %2.</source>
+ <translation>月份 %2 中沒有日期 %1。</translation>
+ </message>
+ <message>
+ <source>Overflow: Can&apos;t represent date %1.</source>
+ <translation>溢位：無法&apos;表示日期 %1。</translation>
+ </message>
+ <message>
+ <source>In a simplified stylesheet module, attribute %1 must be present.</source>
+ <translation>在簡化的樣式表模組中，屬性 %1 必須存在。</translation>
+ </message>
+ <message>
+ <source>Unknown XSL-T attribute %1.</source>
+ <translation>未知的 XSL-T 屬性 %1。</translation>
+ </message>
+ <message>
+ <source>It is not possible to redeclare prefix %1.</source>
+ <translation>無法重宣告前置字串 %1。</translation>
+ </message>
+ <message>
+ <source>exactly one</source>
+ <translation>剛好一個</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid regular expression pattern: %2</source>
+ <translation>%1 是不合法的正規表示式樣式：%2</translation>
+ </message>
+ <message>
+ <source>Element %1 is not allowed at this location.</source>
+ <translation>元素 %1 不能在此位置。</translation>
+ </message>
+ <message>
+ <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
+ <translation>未支援機制確認功能。%1 敘述無法使用。</translation>
+ </message>
+ <message>
+ <source>At least one %1 element must appear as child of %2.</source>
+ <translation>%2 必須至少有一個子元素 %1。</translation>
+ </message>
+ <message>
+ <source>This processor is not Schema-aware and therefore %1 cannot be used.</source>
+ <translation>此處理器不是 Schema-aware，因此不能使用 %1。</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>
+ </message>
+ <message>
+ <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source>
+ <translation>將型態 %1 除以 %2（非數值）是不允許的。</translation>
+ </message>
+ <message>
+ <source>Required cardinality is %1; got cardinality %2.</source>
+ <translation>需要的基數為 %1；得到的是 %2。</translation>
+ </message>
+ <message>
+ <source>A construct was encountered which only is allowed in XQuery.</source>
+ <translation>遇到了建構，實際上只能允許在 XQuery 內。</translation>
+ </message>
+ <message>
+ <source>No function by name %1 is available.</source>
+ <translation>沒有名為 %1 的函式。</translation>
+ </message>
+ <message>
+ <source>The URI cannot have a fragment</source>
+ <translation>URI 不能有片段</translation>
+ </message>
+ <message>
+ <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
+ <translation>%1 不是一個原型態。只能轉換為原型態。</translation>
+ </message>
+ <message>
+ <source>The first argument to %1 cannot be of type %2.</source>
+ <translation>呼叫 %1 的第一個參數不能是 %2 型態。</translation>
+ </message>
+ <message>
+ <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
+ <translation>命名空間網址必須是常數，並且不能使用封閉敘述。</translation>
+ </message>
+ <message>
+ <source>Prefix %1 is already declared in the prolog.</source>
+ <translation>前置字串 %1 已在 prolog 中宣告。</translation>
+ </message>
+ <message>
+ <source>Ambiguous rule match.</source>
+ <translation>不明確的規則符合。</translation>
+ </message>
+ <message>
+ <source>Promoting %1 to %2 may cause loss of precision.</source>
+ <translation>將 %1 抬升為 %2 可能會失去精確度。</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>
+ </message>
+ <message>
+ <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
+ <translation>預設的命名空間宣告必須在函式、變數與選項宣告之前。</translation>
+ </message>
+ <message>
+ <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
+ <translation>操作元 %1 不能用於型態 %2 與 %3 的原數值。</translation>
+ </message>
+ <message>
+ <source>The module import feature is not supported</source>
+ <translation>模組匯入功能未支援</translation>
+ </message>
+ <message>
+ <source>The parameter %1 is passed, but no corresponding %2 exists.</source>
+ <translation>參數 %1 已傳送，但找不到相關的 %2。</translation>
+ </message>
+ <message>
+ <source>A value of type %1 cannot have an Effective Boolean Value.</source>
+ <translation>型態 %1 不能有實際布林值。</translation>
+ </message>
+ <message>
+ <source>The data of a processing instruction cannot contain the string %1</source>
+ <translation>處理指令的資料不能包含字串 %1</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>
+ </message>
+ <message>
+ <source>A template by name %1 has already been declared.</source>
+ <translation>名為 %1 的屬性已被宣告。</translation>
+ </message>
+ <message>
+ <source>It is not possible to bind to the prefix %1</source>
+ <translation>無法與前置字串 %1 結合</translation>
+ </message>
+ <message>
+ <source>Value %1 of type %2 is below minimum (%3).</source>
+ <translation>型態 %2 的數值 %1 已低過最小值（%3）。</translation>
+ </message>
+ <message>
+ <source>Required type is %1, but %2 was found.</source>
+ <translation>需要的型態為 %1，但找到 %2。</translation>
+ </message>
+ <message>
+ <source>%1 is an unsupported encoding.</source>
+ <translation>%1 是個未被支援的編碼。</translation>
+ </message>
+ <message>
+ <source>The name of an option must have a prefix. There is no default namespace for options.</source>
+ <translation>選項名稱必須有前置字串。沒有選項的預設命名空間。</translation>
+ </message>
+ <message>
+ <source>Element %1 must come last.</source>
+ <translation>元素 %1 必須最後出現。</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>
+ </message>
+ <message>
+ <source>No namespace binding exists for the prefix %1 in %2</source>
+ <translation>在 %2 的前置字串 %1 沒有結合命名空間</translation>
+ </message>
+ <message>
+ <source>The name %1 does not refer to any schema type.</source>
+ <translation>名稱 %1 未指向任何機制型態。</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>
+ </message>
+ <message>
+ <source>The initialization of variable %1 depends on itself</source>
+ <translation>變數 %1 的初始化與自身相依</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>
+ </message>
+ <message>
+ <source>Month %1 is outside the range %2..%3.</source>
+ <translation>月份 %1 已超出 %2 到 %3 的範圍。</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>
+ </message>
+ <message>
+ <source>No namespace binding exists for the prefix %1</source>
+ <translation>前置字串 %1 沒有結合命名空間</translation>
+ </message>
+ <message>
+ <source>An %1-attribute with value %2 has already been declared.</source>
+ <translation>已宣告屬性 %1 的值為 %2。</translation>
+ </message>
+ <message>
+ <source>%1 is not valid as a value of type %2.</source>
+ <translation>%1 不是合法的 %2 型態的值。</translation>
+ </message>
+ <message>
+ <source>zero or more</source>
+ <translation>0 個以上</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>
+ </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>
+ </message>
+ <message>
+ <source>%1 is an invalid template mode name.</source>
+ <translation>%1 不是合法的樣本模式名稱。</translation>
+ </message>
+ <message>
+ <source>At least one time component must appear after the %1-delimiter.</source>
+ <translation>在分隔符 %1 後必須至少有一個時間組件。</translation>
+ </message>
+ <message>
+ <source>Overflow: Date can&apos;t be represented.</source>
+ <translation>溢位：無法&apos;表示日期。</translation>
+ </message>
+ <message>
+ <source>Operator %1 is not available between atomic values of type %2 and %3.</source>
+ <translation>操作元 %1 不能用於型態 %2 與 %3 的原數值。</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>
+ </message>
+ <message>
+ <source>%1 is not a valid XML 1.0 character.</source>
+ <translation>%1 不是合法的 XML 1.0 字元。</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>
+ </message>
+ <message>
+ <source>%1 is not a whole number of minutes.</source>
+ <translation>%1 不是分鐘的數值。</translation>
+ </message>
+ <message>
+ <source>Failure when casting from %1 to %2: %3</source>
+ <translation>從 %1 轉換到 %2 時失敗：%3</translation>
+ </message>
+ <message>
+ <source>It is not possible to cast from %1 to %2.</source>
+ <translation>不能從 %1 轉換到 %2。</translation>
+ </message>
+ <message>
+ <source>No variable by name %1 exists</source>
+ <translation>沒有名為 %1 的變數存在</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>
+ </message>
+ <message>
+ <source>The second operand in a division, %1, cannot be zero (%2).</source>
+ <translation>整數除法的第二個運算對象 %1 不能是零（%2）。</translation>
+ </message>
+ <message>
+ <source>Only one %1 declaration can occur in the query prolog.</source>
+ <translation>只有一個 %1 宣告可以在查詢中。</translation>
+ </message>
+ <message>
+ <source>Element %1 must have at least one of the attributes %2 or %3.</source>
+ <translation>元素 %1 必須至少有屬性 %2 或 %3 其中一個。</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>
+ </message>
+ <message>
+ <source>No external functions are supported. All supported functions can be used directly, without first declaring them as external</source>
+ <translation>未支援外部函式。所有支援的含式可以直接使用而不需要先宣告為外部函式</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>
+ </message>
+</context>
+<context>
+ <name>QFontDialog</name>
+ <message>
+ <source>&amp;Font</source>
+ <translation>&amp;字型</translation>
+ </message>
+ <message>
+ <source>&amp;Size</source>
+ <translation>&amp;大小</translation>
+ </message>
+ <message>
+ <source>Sample</source>
+ <translation>範例</translation>
+ </message>
+ <message>
+ <source>Font st&amp;yle</source>
+ <translation>字型樣&amp;式</translation>
+ </message>
+ <message>
+ <source>Wr&amp;iting System</source>
+ <translation>寫&amp;入系統</translation>
+ </message>
+ <message>
+ <source>Select Font</source>
+ <translation>選擇字型</translation>
+ </message>
+ <message>
+ <source>&amp;Underline</source>
+ <translation>&amp;底線</translation>
+ </message>
+ <message>
+ <source>Effects</source>
+ <translation>效果</translation>
+ </message>
+ <message>
+ <source>Stri&amp;keout</source>
+ <translation>刪&amp;除線</translation>
+ </message>
+</context>
+<context>
+ <name>Q3Wizard</name>
+ <message>
+ <source>&amp;Help</source>
+ <translation>&amp;說明</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;取消</translation>
+ </message>
+ <message>
+ <source>&amp;Finish</source>
+ <translation>&amp;完成</translation>
+ </message>
+ <message>
+ <source>&amp;Next &gt;</source>
+ <translation>&amp;下一個 &gt;＞</translation>
+ </message>
+ <message>
+ <source>&lt; &amp;Back</source>
+ <translation>＜&lt; &amp;返回</translation>
+ </message>
+</context>
+<context>
+ <name>QWorkspace</name>
+ <message>
+ <source>&amp;Move</source>
+ <translation>&amp;移動</translation>
+ </message>
+ <message>
+ <source>&amp;Size</source>
+ <translation>&amp;大小</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>Minimize</source>
+ <translation>最小化</translation>
+ </message>
+ <message>
+ <source>Stay on &amp;Top</source>
+ <translation>留在&amp;頂端</translation>
+ </message>
+ <message>
+ <source>&amp;Close</source>
+ <translation>&amp;關閉</translation>
+ </message>
+ <message>
+ <source>%1 - [%2]</source>
+ <translation>%1 - [%2]</translation>
+ </message>
+ <message>
+ <source>Sh&amp;ade</source>
+ <translation>遮&amp;蔽)</translation>
+ </message>
+ <message>
+ <source>&amp;Restore</source>
+ <translation>&amp;回復</translation>
+ </message>
+ <message>
+ <source>&amp;Unshade</source>
+ <translation>&amp;取消遮蔽</translation>
+ </message>
+ <message>
+ <source>Mi&amp;nimize</source>
+ <translation>最小&amp;化</translation>
+ </message>
+ <message>
+ <source>Ma&amp;ximize</source>
+ <translation>最大&amp;化</translation>
+ </message>
+ <message>
+ <source>Restore Down</source>
+ <translation>向下恢復</translation>
+ </message>
+</context>
+<context>
+ <name>QColorDialog</name>
+ <message>
+ <source>&amp;Red:</source>
+ <translation>&amp;紅:</translation>
+ </message>
+ <message>
+ <source>&amp;Sat:</source>
+ <translation>&amp;飽和度:</translation>
+ </message>
+ <message>
+ <source>&amp;Val:</source>
+ <translation>&amp;亮度:</translation>
+ </message>
+ <message>
+ <source>Hu&amp;e:</source>
+ <translation>色&amp;調:</translation>
+ </message>
+ <message>
+ <source>Select Color</source>
+ <translation>選擇顏色</translation>
+ </message>
+ <message>
+ <source>&amp;Add to Custom Colors</source>
+ <translation>&amp;新增到自訂顏色</translation>
+ </message>
+ <message>
+ <source>Bl&amp;ue:</source>
+ <translation>藍&amp;色):</translation>
+ </message>
+ <message>
+ <source>&amp;Green:</source>
+ <translation>綠&amp;色):</translation>
+ </message>
+ <message>
+ <source>&amp;Basic colors</source>
+ <translation>&amp;基本顏色</translation>
+ </message>
+ <message>
+ <source>&amp;Custom colors</source>
+ <translation>&amp;自訂顏色</translation>
+ </message>
+ <message>
+ <source>A&amp;lpha channel:</source>
+ <translation>&amp;Alpha 色版:</translation>
+ </message>
+</context>
+<context>
+ <name>QSharedMemory</name>
+ <message>
+ <source>%1: system-imposed size restrictions</source>
+ <translation>%1：系統大小限制</translation>
+ </message>
+ <message>
+ <source>%1: unix key file doesn&apos;t exists</source>
+ <translation>%1：unix 鍵值檔不&apos;存在</translation>
+ </message>
+ <message>
+ <source>%1: doesn&apos;t exists</source>
+ <translation>%1：不&apos;存在</translation>
+ </message>
+ <message>
+ <source>%1: key is empty</source>
+ <translation>%1：鍵值是空的</translation>
+ </message>
+ <message>
+ <source>%1: key error</source>
+ <translation>%1：鍵值錯誤</translation>
+ </message>
+ <message>
+ <source>%1: create size is less then 0</source>
+ <translation>%1：建立大小小於 0</translation>
+ </message>
+ <message>
+ <source>%1: already exists</source>
+ <translation>%1：已存在</translation>
+ </message>
+ <message>
+ <source>%1: unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
+ </message>
+ <message>
+ <source>%1: invalid size</source>
+ <translation>%1：不合法的大小</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>
+ </message>
+ <message>
+ <source>%1: unable to unlock</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>
+ </message>
+ <message>
+ <source>%1: out of resources</source>
+ <translation>%1：資源不足</translation>
+ </message>
+ <message>
+ <source>%1: not attached</source>
+ <translation>%1：未附加</translation>
+ </message>
+ <message>
+ <source>%1: size query failed</source>
+ <translation>%1：大小查詢失敗</translation>
+ </message>
+ <message>
+ <source>%1: unable to lock</source>
+ <translation>%1：無法鎖定</translation>
+ </message>
+</context>
+<context>
+ <name>QXmlStream</name>
+ <message>
+ <source>Reference to unparsed entity &apos;%1&apos;.</source>
+ <translation>參考到未剖析的實體 &apos;%1&apos;1。</translation>
+ </message>
+ <message>
+ <source>Unexpected character &apos;%1&apos; in public id literal.</source>
+ <translation>在公開代碼字元中&apos;%1&apos;遇到非預期的字元 %1。</translation>
+ </message>
+ <message>
+ <source>Illegal namespace declaration.</source>
+ <translation>不合法的命名空間宣告。</translation>
+ </message>
+ <message>
+ <source>Invalid XML character.</source>
+ <translation>不合法的 XML 字元。</translation>
+ </message>
+ <message>
+ <source>Expected character data.</source>
+ <translation>預期的字元資料。</translation>
+ </message>
+ <message>
+ <source>Standalone accepts only yes or no.</source>
+ <translation>獨立實體只接受 yes 或 no。</translation>
+ </message>
+ <message>
+ <source>Invalid XML version string.</source>
+ <translation>不合法的 XML 版本字串。</translation>
+ </message>
+ <message>
+ <source>Invalid processing instruction name.</source>
+ <translation>不合法的處理指令名稱。</translation>
+ </message>
+ <message>
+ <source>Namespace prefix &apos;%1&apos; not declared</source>
+ <translation>命名空間的前置字串&apos;%1&apos;未宣告</translation>
+ </message>
+ <message>
+ <source>Entity &apos;%1&apos; not declared.</source>
+ <translation>實體 %1 &apos;%1&apos;未宣告。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid processing instruction name.</source>
+ <translation>%1 是不合法的處理指令名稱。</translation>
+ </message>
+ <message>
+ <source>The standalone pseudo attribute must appear after the encoding.</source>
+ <translation>獨立的虛擬屬性必須在編碼之後出現。</translation>
+ </message>
+ <message>
+ <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
+ <translation>在內文中&apos;]]&gt;&apos;不允許有序列。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid encoding name.</source>
+ <translation>%1 為不合法的編碼名稱。</translation>
+ </message>
+ <message>
+ <source>, but got &apos;</source>
+ <translation>，但是看到的是 &apos;</translation>
+ </message>
+ <message>
+ <source>Start tag expected.</source>
+ <translation>預期應有開始標籤。</translation>
+ </message>
+ <message>
+ <source>Invalid character reference.</source>
+ <translation>不合法的字元參考。</translation>
+ </message>
+ <message>
+ <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
+ <translation>在屬性值中 &apos;%1&apos;參考到外部實體 %1。</translation>
+ </message>
+ <message>
+ <source>Expected </source>
+ <translation>預期應為 </translation>
+ </message>
+ <message>
+ <source>Invalid document.</source>
+ <translation>不合法的文件。</translation>
+ </message>
+ <message>
+ <source>Opening and ending tag mismatch.</source>
+ <translation>開啟與結束的標籤不對稱。</translation>
+ </message>
+ <message>
+ <source>Encountered incorrectly encoded content.</source>
+ <translation>遇到不正確的編碼內容。</translation>
+ </message>
+ <message>
+ <source>Invalid attribute in XML declaration.</source>
+ <translation>XML 宣告中有不合法的屬性。</translation>
+ </message>
+ <message>
+ <source>Attribute redefined.</source>
+ <translation>屬性重定義。</translation>
+ </message>
+ <message>
+ <source>%1 is an invalid PUBLIC identifier.</source>
+ <translation>%1 為不合法的 PUBLIC 識別子。</translation>
+ </message>
+ <message>
+ <source>Extra content at end of document.</source>
+ <translation>文件尾端有多餘的內容。</translation>
+ </message>
+ <message>
+ <source>Invalid XML name.</source>
+ <translation>不合法的 XML 名稱。</translation>
+ </message>
+ <message>
+ <source>Premature end of document.</source>
+ <translation>文件結尾不正確。</translation>
+ </message>
+ <message>
+ <source>XML declaration not at start of document.</source>
+ <translation>XML 宣告沒有在文件開始處。</translation>
+ </message>
+ <message>
+ <source>Recursive entity detected.</source>
+ <translation>偵測到遞迴實體。</translation>
+ </message>
+ <message>
+ <source>Unsupported XML version.</source>
+ <translation>未支援的 XML 版本。</translation>
+ </message>
+ <message>
+ <source>Unexpected &apos;</source>
+ <translation>非預期 &apos;</translation>
+ </message>
+ <message>
+ <source>Invalid entity value.</source>
+ <translation>不合法的實體值。</translation>
+ </message>
+ <message>
+ <source>Encoding %1 is unsupported</source>
+ <translation>編碼 %1 不支援</translation>
+ </message>
+ <message>
+ <source>NDATA in parameter entity declaration.</source>
+ <translation>在參數實體宣告有 NDATA。</translation>
+ </message>
+</context>
+<context>
+ <name>QProcess</name>
+ <message>
+ <source>Error writing to process</source>
+ <translation>寫入行程時發生錯誤</translation>
+ </message>
+ <message>
+ <source>Resource error (fork failure): %1</source>
+ <translation>資源錯誤（fork 失敗）：%1</translation>
+ </message>
+ <message>
+ <source>Error reading from process</source>
+ <translation>從行程讀取時發生錯誤</translation>
+ </message>
+ <message>
+ <source>Process failed to start</source>
+ <translation>啟動行程失敗</translation>
+ </message>
+ <message>
+ <source>Could not open input redirection for reading</source>
+ <translation>無法開啟輸入導向以讀取</translation>
+ </message>
+ <message>
+ <source>Could not open output redirection for writing</source>
+ <translation>無法開啟輸出導向以寫入</translation>
+ </message>
+ <message>
+ <source>Process operation timed out</source>
+ <translation>行程操作逾時</translation>
+ </message>
+ <message>
+ <source>Process crashed</source>
+ <translation>行程已崩潰</translation>
+ </message>
+</context>
+<context>
+ <name>QNativeSocketEngine</name>
+ <message>
+ <source>The proxy type is invalid for this operation</source>
+ <translation>代理伺服器型態無法支援此操作</translation>
+ </message>
+ <message>
+ <source>Network operation timed out</source>
+ <translation>網路操作逾時</translation>
+ </message>
+ <message>
+ <source>The remote host closed the connection</source>
+ <translation>遠端主機關閉了連線</translation>
+ </message>
+ <message>
+ <source>Invalid socket descriptor</source>
+ <translation>不合法的 socket 描述子</translation>
+ </message>
+ <message>
+ <source>Host unreachable</source>
+ <translation>無法連線到主機</translation>
+ </message>
+ <message>
+ <source>Protocol type not supported</source>
+ <translation>協定型態未支援</translation>
+ </message>
+ <message>
+ <source>Datagram was too large to send</source>
+ <translation>資料過大無法送出</translation>
+ </message>
+ <message>
+ <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
+ <translation>試圖在沒有 IPv6 支援的平台上使用 IPv6 socket</translation>
+ </message>
+ <message>
+ <source>Unable to receive a message</source>
+ <translation>無法接收訊息</translation>
+ </message>
+ <message>
+ <source>Permission denied</source>
+ <translation>權限不足</translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation>連線被拒</translation>
+ </message>
+ <message>
+ <source>Unable to write</source>
+ <translation>無法寫入</translation>
+ </message>
+ <message>
+ <source>Another socket is already listening on the same port</source>
+ <translation>另一個 socket 已經在監聽同一個連接埠</translation>
+ </message>
+ <message>
+ <source>Unable to send a message</source>
+ <translation>無法送出訊息</translation>
+ </message>
+ <message>
+ <source>The bound address is already in use</source>
+ <translation>結合的位址已經在使用中</translation>
+ </message>
+ <message>
+ <source>Connection timed out</source>
+ <translation>連線逾時</translation>
+ </message>
+ <message>
+ <source>Network error</source>
+ <translation>網路錯誤</translation>
+ </message>
+ <message>
+ <source>Unsupported socket operation</source>
+ <translation>未支援的 socket 操作</translation>
+ </message>
+ <message>
+ <source>Operation on non-socket</source>
+ <translation>對非 socket 操作</translation>
+ </message>
+ <message>
+ <source>Unable to initialize broadcast socket</source>
+ <translation>無法初始化廣播 socket</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的錯誤</translation>
+ </message>
+ <message>
+ <source>Unable to initialize non-blocking socket</source>
+ <translation>無法初始化非阻擋性 socket</translation>
+ </message>
+ <message>
+ <source>The address is protected</source>
+ <translation>此位址已被保護</translation>
+ </message>
+ <message>
+ <source>Network unreachable</source>
+ <translation>無法使用網路</translation>
+ </message>
+ <message>
+ <source>The address is not available</source>
+ <translation>無法取得位址</translation>
+ </message>
+ <message>
+ <source>Out of resources</source>
+ <translation>資源不足</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessFtpBackend</name>
+ <message>
+ <source>No suitable proxy found</source>
+ <translation>找不到合適的代理伺服器</translation>
+ </message>
+ <message>
+ <source>Error while downloading %1: %2</source>
+ <translation>下載 %1 時發生錯誤：%2</translation>
+ </message>
+ <message>
+ <source>Error while uploading %1: %2</source>
+ <translation>上傳 %1 時發生錯誤：%2</translation>
+ </message>
+ <message>
+ <source>Cannot open %1: is a directory</source>
+ <translation>無法開啟 %1：是一個目錄</translation>
+ </message>
+ <message>
+ <source>Logging in to %1 failed: authentication required</source>
+ <translation>登入 %1 失敗：需要認證</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessHttpBackend</name>
+ <message>
+ <source>No suitable proxy found</source>
+ <translation>找不到合適的代理伺服器</translation>
+ </message>
+</context>
+<context>
+ <name>QCheckBox</name>
+ <message>
+ <source>Check</source>
+ <translation>勾選</translation>
+ </message>
+ <message>
+ <source>Toggle</source>
+ <translation>切換</translation>
+ </message>
+ <message>
+ <source>Uncheck</source>
+ <translation>取消勾選</translation>
+ </message>
+</context>
+<context>
+ <name>QRadioButton</name>
+ <message>
+ <source>Check</source>
+ <translation>勾選</translation>
+ </message>
+</context>
+<context>
+ <name>Q3TitleBar</name>
+ <message>
+ <source>Close</source>
+ <translation>關閉</translation>
+ </message>
+ <message>
+ <source>Minimize</source>
+ <translation>最小化</translation>
+ </message>
+ <message>
+ <source>Puts a minimized back to normal</source>
+ <translation>將最小化視窗放回原大小</translation>
+ </message>
+ <message>
+ <source>Displays the name of the window and contains controls to manipulate it</source>
+ <translation>顯示視窗名稱，並包含操作它的控制元件</translation>
+ </message>
+ <message>
+ <source>Makes the window full screen</source>
+ <translation>將視窗放大到全畫面</translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation>系統</translation>
+ </message>
+ <message>
+ <source>Maximize</source>
+ <translation>最大化</translation>
+ </message>
+ <message>
+ <source>Contains commands to manipulate the window</source>
+ <translation>包含要操作此視窗的指令</translation>
+ </message>
+ <message>
+ <source>Restore up</source>
+ <translation>向上恢復</translation>
+ </message>
+ <message>
+ <source>Closes the window</source>
+ <translation>關閉視窗</translation>
+ </message>
+ <message>
+ <source>Puts a maximized window back to normal</source>
+ <translation>將最大化視窗放回原大小</translation>
+ </message>
+ <message>
+ <source>Moves the window out of the way</source>
+ <translation>把視窗移開</translation>
+ </message>
+ <message>
+ <source>Restore down</source>
+ <translation>向下恢復</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::</name>
+ <message>
+ <source>Games</source>
+ <translation>遊戲</translation>
+ </message>
+ <message>
+ <source>Music</source>
+ <translation>音樂</translation>
+ </message>
+ <message>
+ <source>Video</source>
+ <translation>影像</translation>
+ </message>
+ <message>
+ <source>Communication</source>
+ <translation>通訊</translation>
+ </message>
+ <message>
+ <source>Accessibility</source>
+ <translation>輔助裝置</translation>
+ </message>
+ <message>
+ <source>Notifications</source>
+ <translation>通知</translation>
+ </message>
+</context>
+<context>
+ <name>VolumeSlider</name>
+ <message>
+ <source>Muted</source>
+ <translation>靜音</translation>
+ </message>
+ <message>
+ <source>Volume: %1%</source>
+ <translation>音量：%1%</translation>
+ </message>
+</context>
+<context>
+ <name>Q3LocalFs</name>
+ <message>
+ <source>Could not open
+%1</source>
+ <translation>無法開啟
+%1</translation>
+ </message>
+ <message>
+ <source>Could not remove file or directory
+%1</source>
+ <translation>無法移除目錄
+%1</translation>
+ </message>
+ <message>
+ <source>Could not create directory
+%1</source>
+ <translation>無法建立目錄
+%1</translation>
+ </message>
+ <message>
+ <source>Could not read directory
+%1</source>
+ <translation>無法讀取目錄
+%1</translation>
+ </message>
+ <message>
+ <source>Could not rename
+%1
+to
+%2</source>
+ <translation>無法將
+%1
+重新命名為
+%2</translation>
+ </message>
+ <message>
+ <source>Could not write
+%1</source>
+ <translation>無法寫入
+%1</translation>
+ </message>
+</context>
+<context>
+ <name>QDial</name>
+ <message>
+ <source>QDial</source>
+ <translation>QDial</translation>
+ </message>
+ <message>
+ <source>SliderHandle</source>
+ <translation>SliderHandle</translation>
+ </message>
+ <message>
+ <source>SpeedoMeter</source>
+ <translation>SpeedoMeter</translation>
+ </message>
+</context>
+<context>
+ <name>QSocks5SocketEngine</name>
+ <message>
+ <source>Network operation timed out</source>
+ <translation>網路操作逾時</translation>
+ </message>
+ <message>
+ <source>Connection to proxy closed prematurely</source>
+ <translation>代理伺服器連線已不正常關閉</translation>
+ </message>
+ <message>
+ <source>Proxy authentication failed: %1</source>
+ <translation>代理伺服器認證失敗：%1</translation>
+ </message>
+ <message>
+ <source>Proxy authentication failed</source>
+ <translation>代理伺服器認證失敗</translation>
+ </message>
+ <message>
+ <source>General SOCKSv5 server failure</source>
+ <translation>一般的 SOCKSv5 伺服器錯誤</translation>
+ </message>
+ <message>
+ <source>Unknown SOCKSv5 proxy error code 0x%1</source>
+ <translation>未知的 SOCKSv5 代理伺服器錯誤代碼 0x%1</translation>
+ </message>
+ <message>
+ <source>Connection not allowed by SOCKSv5 server</source>
+ <translation>連線未被 SOCKSv5 伺服器允許</translation>
+ </message>
+ <message>
+ <source>SOCKSv5 command not supported</source>
+ <translation>SOCKSv5 指令未被支援</translation>
+ </message>
+ <message>
+ <source>Connection to proxy timed out</source>
+ <translation>代理伺服器連線逾時</translation>
+ </message>
+ <message>
+ <source>Proxy host not found</source>
+ <translation>找不到代理伺服器</translation>
+ </message>
+ <message>
+ <source>TTL expired</source>
+ <translation>TTL 逾時</translation>
+ </message>
+ <message>
+ <source>Address type not supported</source>
+ <translation>位址型態未被支援</translation>
+ </message>
+ <message>
+ <source>Connection to proxy refused</source>
+ <translation>代理伺服器連線被拒</translation>
+ </message>
+ <message>
+ <source>SOCKS version 5 protocol error</source>
+ <translation>SOCKS 5 的協定錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>QWhatsThisAction</name>
+ <message>
+ <source>What&apos;s This?</source>
+ <translation>這是&apos;什麼?</translation>
+ </message>
+</context>
+<context>
+ <name>Q3UrlOperator</name>
+ <message>
+ <source>The protocol `%1&apos; does not support getting files</source>
+ <translation>協定 %1&apos; 未支援取得檔案</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support renaming files or directories</source>
+ <translation>協定 %1&apos; 未支援重新命名檔案或目錄</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support listing directories</source>
+ <translation>協定 %1&apos; 未支援列出目錄</translation>
+ </message>
+ <message>
+ <source>(unknown)</source>
+ <translation>（未知）</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support removing files or directories</source>
+ <translation>協定 %1&apos; 未支援移除檔案或目錄</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support putting files</source>
+ <translation>協定 %1&apos; 未支援寫入檔案</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; is not supported</source>
+ <translation>協定 %1 未支援</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support copying or moving files or directories</source>
+ <translation>協定 %1 未支援複製或移動檔案或目錄</translation>
+ </message>
+ <message>
+ <source>The protocol `%1&apos; does not support creating new directories</source>
+ <translation>協定 %1 未支援建立新目錄</translation>
+ </message>
+</context>
+<context>
+ <name>QFtp</name>
+ <message>
+ <source>Listing directory failed:
+%1</source>
+ <translation>列出目錄時失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Creating directory failed:
+%1</source>
+ <translation>建立目錄時失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Not connected</source>
+ <translation>未連線</translation>
+ </message>
+ <message>
+ <source>Connection refused for data connection</source>
+ <translation>資料連線被拒</translation>
+ </message>
+ <message>
+ <source>Login failed:
+%1</source>
+ <translation>登入失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Downloading file failed:
+%1</source>
+ <translation>下載檔案時失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Connected to host</source>
+ <translation>已連線到主機</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>Connecting to host failed:
+%1</source>
+ <translation>連線到主機失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Host %1 not found</source>
+ <translation>找不到主機 %1</translation>
+ </message>
+ <message>
+ <source>Uploading file failed:
+%1</source>
+ <translation>上傳檔案時失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Changing directory failed:
+%1</source>
+ <translation>變更目錄時失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Host found</source>
+ <translation>找到主機</translation>
+ </message>
+ <message>
+ <source>Removing directory failed:
+%1</source>
+ <translation>移除目錄時失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Connection refused to host %1</source>
+ <translation>連線到主機 %1 被拒</translation>
+ </message>
+ <message>
+ <source>Connection to %1 closed</source>
+ <translation>到 %1 的連線已關閉</translation>
+ </message>
+ <message>
+ <source>Removing file failed:
+%1</source>
+ <translation>移除檔案時失敗：
+%1</translation>
+ </message>
+ <message>
+ <source>Host %1 found</source>
+ <translation>找到主機 %1</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的錯誤</translation>
+ </message>
+ <message>
+ <source>Connection closed</source>
+ <translation>連線已關閉</translation>
+ </message>
+</context>
+<context>
+ <name>QDB2Driver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Unable to set autocommit</source>
+ <translation>無法設定自動提交</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>無法連接</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+</context>
+<context>
+ <name>QIBaseDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Could not start transaction</source>
+ <translation>無法開始事務</translation>
+ </message>
+ <message>
+ <source>Error opening database</source>
+ <translation>開啟資料庫發生錯誤</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+</context>
+<context>
+ <name>QIBaseResult</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Unable to open BLOB</source>
+ <translation>無法開啟 BLOB</translation>
+ </message>
+ <message>
+ <source>Could not describe statement</source>
+ <translation>無法描述敘述</translation>
+ </message>
+ <message>
+ <source>Could not describe input statement</source>
+ <translation>無法描述輸入敘述</translation>
+ </message>
+ <message>
+ <source>Could not allocate statement</source>
+ <translation>無法配置敘述</translation>
+ </message>
+ <message>
+ <source>Unable to write BLOB</source>
+ <translation>無法寫入 BLOB</translation>
+ </message>
+ <message>
+ <source>Could not start transaction</source>
+ <translation>無法開始事務</translation>
+ </message>
+ <message>
+ <source>Unable to close statement</source>
+ <translation>無法關閉敘述</translation>
+ </message>
+ <message>
+ <source>Could not get query info</source>
+ <translation>無法取得查詢資訊</translation>
+ </message>
+ <message>
+ <source>Could not find array</source>
+ <translation>找不到陣列</translation>
+ </message>
+ <message>
+ <source>Could not get array data</source>
+ <translation>無法取得陣列資料</translation>
+ </message>
+ <message>
+ <source>Unable to execute query</source>
+ <translation>無法執行查詢</translation>
+ </message>
+ <message>
+ <source>Could not prepare statement</source>
+ <translation>無法準備敘述</translation>
+ </message>
+ <message>
+ <source>Could not fetch next item</source>
+ <translation>無法抓取下一個項目</translation>
+ </message>
+ <message>
+ <source>Could not get statement info</source>
+ <translation>無法取得敘述資訊</translation>
+ </message>
+ <message>
+ <source>Unable to create BLOB</source>
+ <translation>無法建立 BLOB</translation>
+ </message>
+ <message>
+ <source>Unable to read BLOB</source>
+ <translation>無法讀取 BLOB</translation>
+ </message>
+</context>
+<context>
+ <name>QMYSQLDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Unable to open database &apos;</source>
+ <translation>無法開啟資料庫&apos;</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>無法連線</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始事務</translation>
+ </message>
+</context>
+<context>
+ <name>QOCIDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Unable to initialize</source>
+ <translation>無法初始化</translation>
+ </message>
+ <message>
+ <source>Unable to logon</source>
+ <translation>無法登入</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始事務</translation>
+ </message>
+</context>
+<context>
+ <name>QODBCDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Unable to enable autocommit</source>
+ <translation>無法開啟自動提交功能</translation>
+ </message>
+ <message>
+ <source>Unable to connect - Driver doesn&apos;t support all needed functionality</source>
+ <translation>無法連接─驅動程式無法&apos;支援所有需要的功能</translation>
+ </message>
+ <message>
+ <source>Unable to disable autocommit</source>
+ <translation>無法關閉自動提交功能</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>無法連接</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLite2Driver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Error to open database</source>
+ <translation>開啟資料庫時發生錯誤</translation>
+ </message>
+ <message>
+ <source>Unable to rollback Transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始事務</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLiteDriver</name>
+ <message>
+ <source>Unable to commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Error closing database</source>
+ <translation>關閉資料庫發生錯誤</translation>
+ </message>
+ <message>
+ <source>Error opening database</source>
+ <translation>開啟資料庫發生錯誤</translation>
+ </message>
+ <message>
+ <source>Unable to rollback transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+ <message>
+ <source>Unable to begin transaction</source>
+ <translation>無法開始事務</translation>
+ </message>
+</context>
+<context>
+ <name>QAbstractSocket</name>
+ <message>
+ <source>Host not found</source>
+ <translation>找不到主機</translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation>連線被拒</translation>
+ </message>
+ <message>
+ <source>Connection timed out</source>
+ <translation>連線逾時</translation>
+ </message>
+ <message>
+ <source>Socket is not connected</source>
+ <translation>Socket 未連線</translation>
+ </message>
+ <message>
+ <source>Socket operation timed out</source>
+ <translation>Socket 操作逾時</translation>
+ </message>
+ <message>
+ <source>Network unreachable</source>
+ <translation>無法使用網路</translation>
+ </message>
+ <message>
+ <source>Operation on socket is not supported</source>
+ <translation>Socket 的操作未被支援</translation>
+ </message>
+</context>
+<context>
+ <name>QHostInfoAgent</name>
+ <message>
+ <source>Host not found</source>
+ <translation>找不到主機</translation>
+ </message>
+ <message>
+ <source>Unknown address type</source>
+ <translation>未知的位址型態</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::Gstreamer::MediaObject</name>
+ <message>
+ <source>Could not open media source.</source>
+ <translation>無法開啟媒體來源。</translation>
+ </message>
+ <message>
+ <source>Could not decode media source.</source>
+ <translation>無法解碼媒體來源。</translation>
+ </message>
+ <message>
+ <source>Invalid source type.</source>
+ <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>
+ </message>
+ <message>
+ <source>Could not open audio device. The device is already in use.</source>
+ <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>
+ </message>
+ <message>
+ <source>Could not locate media source.</source>
+ <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>
+ </message>
+ <message>
+ <source>Cannot unload library %1: %2</source>
+ <translation>無法卸載函式庫 %1：%2</translation>
+ </message>
+ <message>
+ <source>Cannot load library %1: %2</source>
+ <translation>無法載入函式庫 %1：%2</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>
+ </message>
+ <message>
+ <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
+ <translation>無法反解 %2 內的符號 &quot;%1&quot;：%3</translation>
+ </message>
+ <message>
+ <source>Plugin verification data mismatch in &apos;%1&apos;</source>
+ <translation>在 &apos;%1&apos; 中的外掛程式確認資料不符合</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>
+ </message>
+ <message>
+ <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
+ <translation>檔案 &apos;%1&apos; 不是合法的 Qt 外掛程式。</translation>
+ </message>
+ <message>
+ <source>The shared library was not found.</source>
+ <translation>找不到分享函式庫。</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <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>
+ </message>
+ <message>
+ <source>Could not mmap &apos;%1&apos;: %2</source>
+ <translation>無法 mmap &apos;%1&apos;：%2</translation>
+ </message>
+</context>
+<context>
+ <name>QHttp</name>
+ <message>
+ <source>Connection refused (or timed out)</source>
+ <translation>連線被拒（或連線逾時）</translation>
+ </message>
+ <message>
+ <source>Data corrupted</source>
+ <translation>資料已損毀</translation>
+ </message>
+ <message>
+ <source>Connected to host</source>
+ <translation>已連線到主機</translation>
+ </message>
+ <message>
+ <source>Connected to host %1</source>
+ <translation>已連接到主機 %1</translation>
+ </message>
+ <message>
+ <source>Host %1 not found</source>
+ <translation>找不到主機 %1</translation>
+ </message>
+ <message>
+ <source>Host requires authentication</source>
+ <translation>主機需要認證</translation>
+ </message>
+ <message>
+ <source>Error writing response to device</source>
+ <translation>寫入回應到裝置時發生錯誤</translation>
+ </message>
+ <message>
+ <source>HTTPS connection requested but SSL support not compiled in</source>
+ <translation>HTTPS 連線需要的 SSL 支援並未編譯進來</translation>
+ </message>
+ <message>
+ <source>Host found</source>
+ <translation>找到主機</translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation>連線被拒</translation>
+ </message>
+ <message>
+ <source>Proxy authentication required</source>
+ <translation>代理伺服器需要認證</translation>
+ </message>
+ <message>
+ <source>Unknown protocol specified</source>
+ <translation>指定了未知的協定</translation>
+ </message>
+ <message>
+ <source>HTTP request failed</source>
+ <translation>HTTP 要求失敗</translation>
+ </message>
+ <message>
+ <source>Proxy requires authentication</source>
+ <translation>代理伺服器需要認證</translation>
+ </message>
+ <message>
+ <source>Authentication required</source>
+ <translation>需要認證</translation>
+ </message>
+ <message>
+ <source>SSL handshake failed</source>
+ <translation>SSL 溝通失敗</translation>
+ </message>
+ <message>
+ <source>Connection to %1 closed</source>
+ <translation>到 %1 的連線已關閉</translation>
+ </message>
+ <message>
+ <source>Invalid HTTP chunked body</source>
+ <translation>不合法的 HTTP 區塊主體</translation>
+ </message>
+ <message>
+ <source>Host %1 found</source>
+ <translation>找到主機 %1</translation>
+ </message>
+ <message>
+ <source>Wrong content length</source>
+ <translation>錯誤的內容長度</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的錯誤</translation>
+ </message>
+ <message>
+ <source>Invalid HTTP response header</source>
+ <translation>不合法的 HTTP 回覆標頭</translation>
+ </message>
+ <message>
+ <source>Connection closed</source>
+ <translation>連線已關閉</translation>
+ </message>
+ <message>
+ <source>No server set to connect to</source>
+ <translation>沒有設定要連線到哪個伺服器</translation>
+ </message>
+ <message>
+ <source>Server closed connection unexpectedly</source>
+ <translation>伺服器無預警關閉連線</translation>
+ </message>
+ <message>
+ <source>Request aborted</source>
+ <translation>要求中止</translation>
+ </message>
+</context>
+<context>
+ <name>QXml</name>
+ <message>
+ <source>unparsed entity reference in wrong context</source>
+ <translation>在錯誤的內文中有未剖析的實體參考</translation>
+ </message>
+ <message>
+ <source>external parsed general entity reference not allowed in DTD</source>
+ <translation>在 DTD 中不允許使用外部剖析的實體參考</translation>
+ </message>
+ <message>
+ <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>no error occurred</source>
+ <translation>沒有發生錯誤</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing reference</source>
+ <translation>剖析參考時發生錯誤</translation>
+ </message>
+ <message>
+ <source>standalone declaration expected while reading the XML declaration</source>
+ <translation>讀取 XML 宣告時應有讀立宣告</translation>
+ </message>
+ <message>
+ <source>invalid name for processing instruction</source>
+ <translation>處理指令時的不合法名稱</translation>
+ </message>
+ <message>
+ <source>error triggered by consumer</source>
+ <translation>用戶觸發的錯誤</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing element</source>
+ <translation>剖析元素時發生錯誤</translation>
+ </message>
+ <message>
+ <source>unexpected character</source>
+ <translation>非預期的字元</translation>
+ </message>
+ <message>
+ <source>tag mismatch</source>
+ <translation>標籤不對稱</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing content</source>
+ <translation>剖析內容時發生錯誤</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing comment</source>
+ <translation>剖析註解時發生錯誤</translation>
+ </message>
+ <message>
+ <source>internal general entity reference not allowed in DTD</source>
+ <translation>在 DTD 中不允許內部產生的實體參考</translation>
+ </message>
+ <message>
+ <source>recursive entities</source>
+ <translation>遞迴的實體</translation>
+ </message>
+ <message>
+ <source>more than one document type definition</source>
+ <translation>定義了一個以上的文件型態</translation>
+ </message>
+ <message>
+ <source>version expected while reading the XML declaration</source>
+ <translation>讀取 XML 宣告時應有版本號</translation>
+ </message>
+ <message>
+ <source>letter is expected</source>
+ <translation>預期應為字母</translation>
+ </message>
+ <message>
+ <source>unexpected end of file</source>
+ <translation>未預期遇到檔案結尾</translation>
+ </message>
+ <message>
+ <source>external parsed general entity reference not allowed in attribute value</source>
+ <translation>在屬性值中不允許使用外部剖析的實體參考</translation>
+ </message>
+ <message>
+ <source>error in the text declaration of an external entity</source>
+ <translation>在外部實體中的文字宣告有錯誤</translation>
+ </message>
+ <message>
+ <source>error occurred while parsing document type definition</source>
+ <translation>剖析文件型態定義時發生錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>QSystemSemaphore</name>
+ <message>
+ <source>%1: does not exist</source>
+ <translation>%1：不存在</translation>
+ </message>
+ <message>
+ <source>%1: already exists</source>
+ <translation>%1：已存在</translation>
+ </message>
+ <message>
+ <source>%1: unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
+ </message>
+ <message>
+ <source>%1: permission denied</source>
+ <translation>%1：存取被拒</translation>
+ </message>
+ <message>
+ <source>%1: out of resources</source>
+ <translation>%1：資源不足</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLiteResult</name>
+ <message>
+ <source>Unable to fetch row</source>
+ <translation>無法抓取列</translation>
+ </message>
+ <message>
+ <source>No query</source>
+ <translation>沒有查詢</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行敘述</translation>
+ </message>
+ <message>
+ <source>Unable to bind parameters</source>
+ <translation>無法結合參數</translation>
+ </message>
+ <message>
+ <source>Unable to reset statement</source>
+ <translation>無法重置敘述</translation>
+ </message>
+ <message>
+ <source>Parameter count mismatch</source>
+ <translation>參數數量不符合</translation>
+ </message>
+</context>
+<context>
+ <name>QApplication</name>
+ <message>
+ <source>Activates the program&apos;s main window</source>
+ <translation>啟動程式的主視窗</translation>
+ </message>
+ <message>
+ <source>QT_LAYOUT_DIRECTION</source>
+ <translation>LTR</translation>
+ </message>
+ <message>
+ <source>Activate</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>
+ </message>
+ <message>
+ <source>Incompatible Qt Library Error</source>
+ <translation>Qt 函式庫不相容的錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>QUnicodeControlCharacterMenu</name>
+ <message>
+ <source>RLE Start of right-to-left embedding</source>
+ <translation>RLE 右到左嵌入起點</translation>
+ </message>
+ <message>
+ <source>ZWSP Zero width space</source>
+ <translation>ZWSP 零寬度空白</translation>
+ </message>
+ <message>
+ <source>Insert Unicode control character</source>
+ <translation>插入萬國碼控制字元</translation>
+ </message>
+ <message>
+ <source>LRO Start of left-to-right override</source>
+ <translation>LRO 左到右覆寫起點</translation>
+ </message>
+ <message>
+ <source>LRE Start of left-to-right embedding</source>
+ <translation>LRE 左到右嵌入起點</translation>
+ </message>
+ <message>
+ <source>RLM Right-to-left mark</source>
+ <translation>RLM 右到左標記</translation>
+ </message>
+ <message>
+ <source>PDF Pop directional formatting</source>
+ <translation>PDF 彈出方向格式</translation>
+ </message>
+ <message>
+ <source>ZWNJ Zero width non-joiner</source>
+ <translation>ZWNJ 零寬度非連接器</translation>
+ </message>
+ <message>
+ <source>RLO Start of right-to-left override</source>
+ <translation>RLO 右到左覆寫起點</translation>
+ </message>
+ <message>
+ <source>ZWJ Zero width joiner</source>
+ <translation>ZWJ 零寬度連接器</translation>
+ </message>
+ <message>
+ <source>LRM Left-to-right mark</source>
+ <translation>LRM 左到右標記</translation>
+ </message>
+</context>
+<context>
+ <name>QWebFrame</name>
+ <message>
+ <source>Request blocked</source>
+ <translation>請求已被阻擋</translation>
+ </message>
+ <message>
+ <source>Request cancelled</source>
+ <translation>請求已取消</translation>
+ </message>
+ <message>
+ <source>Cannot show URL</source>
+ <translation>無法顯示網址</translation>
+ </message>
+ <message>
+ <source>Frame load interruped by policy change</source>
+ <translation>影像載入因政策變更而中斷</translation>
+ </message>
+ <message>
+ <source>File does not exist</source>
+ <translation>檔案不存在</translation>
+ </message>
+ <message>
+ <source>Cannot show mimetype</source>
+ <translation>無法顯示 MIME 型態</translation>
+ </message>
+</context>
+<context>
+ <name>QRegExp</name>
+ <message>
+ <source>bad lookahead syntax</source>
+ <translation>錯誤的 lookahead 語法</translation>
+ </message>
+ <message>
+ <source>no error occurred</source>
+ <translation>沒有發生錯誤</translation>
+ </message>
+ <message>
+ <source>missing left delim</source>
+ <translation>少了左方的區隔符</translation>
+ </message>
+ <message>
+ <source>bad char class syntax</source>
+ <translation>錯誤的字元類別語法</translation>
+ </message>
+ <message>
+ <source>disabled feature used</source>
+ <translation>使用已關閉的功能</translation>
+ </message>
+ <message>
+ <source>invalid octal value</source>
+ <translation>不合法的八進位值</translation>
+ </message>
+ <message>
+ <source>bad repetition syntax</source>
+ <translation>錯誤的重覆語法</translation>
+ </message>
+ <message>
+ <source>met internal limit</source>
+ <translation>遇到內部限制</translation>
+ </message>
+ <message>
+ <source>unexpected end</source>
+ <translation>未預期遇到結尾</translation>
+ </message>
+</context>
+<context>
+ <name>QHttpSocketEngine</name>
+ <message>
+ <source>Proxy connection refused</source>
+ <translation>代理伺服器連線被拒</translation>
+ </message>
+ <message>
+ <source>Proxy denied connection</source>
+ <translation>代理伺服器拒絕連線</translation>
+ </message>
+ <message>
+ <source>Proxy server not found</source>
+ <translation>找不到代理伺服器</translation>
+ </message>
+ <message>
+ <source>Proxy server connection timed out</source>
+ <translation>代理伺服器連線逾時</translation>
+ </message>
+ <message>
+ <source>Did not receive HTTP response from proxy</source>
+ <translation>未從代理伺服器接收到 HTTP 回應</translation>
+ </message>
+ <message>
+ <source>Proxy connection closed prematurely</source>
+ <translation>代理伺服器連線已不正常關閉</translation>
+ </message>
+ <message>
+ <source>Error communicating with HTTP proxy</source>
+ <translation>與 HTTP 代理伺服器聯繫時發生錯誤</translation>
+ </message>
+ <message>
+ <source>Authentication required</source>
+ <translation>需要認證</translation>
+ </message>
+ <message>
+ <source>Error parsing authentication request from proxy</source>
+ <translation>剖析從代理伺服器傳來的認證要求時發生錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>QOCIResult</name>
+ <message>
+ <source>Unable to alloc statement</source>
+ <translation>無法配置敘述</translation>
+ </message>
+ <message>
+ <source>Unable to goto next</source>
+ <translation>無法跳到下一個</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行敘述</translation>
+ </message>
+ <message>
+ <source>Unable to bind column for batch execute</source>
+ <translation>無法結合欄位以做批次執行</translation>
+ </message>
+ <message>
+ <source>Unable to execute select statement</source>
+ <translation>無法執行選取的敘述</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備敘述</translation>
+ </message>
+ <message>
+ <source>Unable to execute batch statement</source>
+ <translation>無法執行批次敘述</translation>
+ </message>
+ <message>
+ <source>Unable to bind value</source>
+ <translation>無法結合數值</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkReply</name>
+ <message>
+ <source>Error downloading %1 - server replied: %2</source>
+ <translation>下載 %1 時發生錯誤─伺服器回應：%2</translation>
+ </message>
+ <message>
+ <source>Protocol &quot;%1&quot; is unknown</source>
+ <translation>未知的協定 &quot;%1&quot;</translation>
+ </message>
+</context>
+<context>
+ <name>QAbstractSpinBox</name>
+ <message>
+ <source>Step &amp;down</source>
+ <translation>單步向&amp;下</translation>
+ </message>
+ <message>
+ <source>&amp;Step up</source>
+ <translation>&amp;單步向上</translation>
+ </message>
+ <message>
+ <source>&amp;Select All</source>
+ <translation>&amp;全部選擇</translation>
+ </message>
+</context>
+<context>
+ <name>QDB2Result</name>
+ <message>
+ <source>Unable to bind variable</source>
+ <translation>無法結合變數</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行敘述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch next</source>
+ <translation>無法抓取下一筆</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備敘述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch record %1</source>
+ <translation>無法抓取紀錄 %1</translation>
+ </message>
+ <message>
+ <source>Unable to fetch first</source>
+ <translation>無法抓取第一筆</translation>
+ </message>
+</context>
+<context>
+ <name>QODBCResult</name>
+ <message>
+ <source>Unable to bind variable</source>
+ <translation>無法結合變數</translation>
+ </message>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行敘述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch next</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 fetch previous</source>
+ <translation>無法抓取前一筆</translation>
+ </message>
+ <message>
+ <source>Unable to fetch</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>
+ </message>
+ <message>
+ <source>Unable to fetch first</source>
+ <translation>無法抓取第一筆</translation>
+ </message>
+</context>
+<context>
+ <name>QPSQLDriver</name>
+ <message>
+ <source>Unable to subscribe</source>
+ <translation>無法訂閱</translation>
+ </message>
+ <message>
+ <source>Could not begin transaction</source>
+ <translation>無法開始事務</translation>
+ </message>
+ <message>
+ <source>Could not rollback transaction</source>
+ <translation>無法反轉事務</translation>
+ </message>
+ <message>
+ <source>Could not commit transaction</source>
+ <translation>無法提交事務</translation>
+ </message>
+ <message>
+ <source>Unable to connect</source>
+ <translation>無法連線</translation>
+ </message>
+ <message>
+ <source>Unable to unsubscribe</source>
+ <translation>無法取消訂閱</translation>
+ </message>
+</context>
+<context>
+ <name>QInputDialog</name>
+ <message>
+ <source>Enter a value:</source>
+ <translation>請輸入值:</translation>
+ </message>
+</context>
+<context>
+ <name>QCoreApplication</name>
+ <message>
+ <source>%1: key is empty</source>
+ <translation>%1：鍵值是空的</translation>
+ </message>
+ <message>
+ <source>%1: unable to make key</source>
+ <translation>%1：無法產生鍵值</translation>
+ </message>
+ <message>
+ <source>%1: ftok failed</source>
+ <translation>%1：ftok 失敗</translation>
+ </message>
+</context>
+<context>
+ <name>QIODevice</name>
+ <message>
+ <source>No such file or directory</source>
+ <translation>找不到該檔案或目錄</translation>
+ </message>
+ <message>
+ <source>Permission denied</source>
+ <translation>權限不足</translation>
+ </message>
+ <message>
+ <source>No space left on device</source>
+ <translation>裝置上已無空間</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的錯誤</translation>
+ </message>
+ <message>
+ <source>Too many open files</source>
+ <translation>開啟過多檔案</translation>
+ </message>
+</context>
+<context>
+ <name>QMultiInputContext</name>
+ <message>
+ <source>Select IM</source>
+ <translation>選擇輸入法</translation>
+ </message>
+</context>
+<context>
+ <name>QTabBar</name>
+ <message>
+ <source>Scroll Left</source>
+ <translation>往左捲軸</translation>
+ </message>
+ <message>
+ <source>Scroll Right</source>
+ <translation>往右捲軸</translation>
+ </message>
+</context>
+<context>
+ <name>QUndoModel</name>
+ <message>
+ <source>&lt;empty&gt;</source>
+ <translation>&lt;空白&gt;</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessCacheBackend</name>
+ <message>
+ <source>Error opening %1</source>
+ <translation>開啟 %1 發生錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>QMYSQLResult</name>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行敘述</translation>
+ </message>
+ <message>
+ <source>Unable to store statement results</source>
+ <translation>無法儲存敘述結果</translation>
+ </message>
+ <message>
+ <source>Unable to execute next query</source>
+ <translation>無法執行下一個查詢</translation>
+ </message>
+ <message>
+ <source>Unable to bind outvalues</source>
+ <translation>無法結合輸出值</translation>
+ </message>
+ <message>
+ <source>Unable to store next result</source>
+ <translation>無法儲存下一個結果</translation>
+ </message>
+ <message>
+ <source>Unable to fetch data</source>
+ <translation>無法抓取資料</translation>
+ </message>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備敘述</translation>
+ </message>
+ <message>
+ <source>Unable to store result</source>
+ <translation>無法儲存結果</translation>
+ </message>
+ <message>
+ <source>Unable to bind value</source>
+ <translation>無法結合數值</translation>
+ </message>
+ <message>
+ <source>Unable to execute query</source>
+ <translation>無法執行查詢</translation>
+ </message>
+ <message>
+ <source>Unable to reset statement</source>
+ <translation>無法重置敘述</translation>
+ </message>
+</context>
+<context>
+ <name>QSQLite2Result</name>
+ <message>
+ <source>Unable to execute statement</source>
+ <translation>無法執行敘述</translation>
+ </message>
+ <message>
+ <source>Unable to fetch results</source>
+ <translation>無法抓取結果</translation>
+ </message>
+</context>
+<context>
+ <name>Q3MainWindow</name>
+ <message>
+ <source>Line up</source>
+ <translation>排列</translation>
+ </message>
+ <message>
+ <source>Customize...</source>
+ <translation>自訂...</translation>
+ </message>
+</context>
+<context>
+ <name>QUdpSocket</name>
+ <message>
+ <source>This platform does not support IPv6</source>
+ <translation>此平台不支援 IPv6</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::Gstreamer::Backend</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>
+ </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>
+ </message>
+</context>
+<context>
+ <name>QLocalServer</name>
+ <message>
+ <source>%1: Name error</source>
+ <translation>%1：名稱錯誤</translation>
+ </message>
+ <message>
+ <source>%1: Unknown error %2</source>
+ <translation>%1：未知的錯誤 %2</translation>
+ </message>
+ <message>
+ <source>%1: Permission denied</source>
+ <translation>%1：存取被拒</translation>
+ </message>
+ <message>
+ <source>%1: Address in use</source>
+ <translation>%1：位址使用中</translation>
+ </message>
+</context>
+<context>
+ <name>Phonon::VolumeSlider</name>
+ <message>
+ <source>Volume: %1%</source>
+ <translation>音量：%1%</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>
+ </message>
+</context>
+<context>
+ <name>Q3ToolBar</name>
+ <message>
+ <source>More...</source>
+ <translation>更多...</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>
+ </message>
+ <message>
+ <source>Multiple input method switcher</source>
+ <translation>多重輸入法切換器</translation>
+ </message>
+</context>
+<context>
+ <name>Q3ProgressDialog</name>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+</context>
+<context>
+ <name>QProgressDialog</name>
+ <message>
+ <source>Cancel</source>
+ <translation>取消</translation>
+ </message>
+</context>
+<context>
+ <name>QFile</name>
+ <message>
+ <source>Cannot create %1 for output</source>
+ <translation>無法建立 %1 以輸出</translation>
+ </message>
+ <message>
+ <source>Failure to write block</source>
+ <translation>寫入區塊時失敗</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for input</source>
+ <translation>無法開啟 %1 以輸入</translation>
+ </message>
+ <message>
+ <source>Destination file exists</source>
+ <translation>目標檔已存在</translation>
+ </message>
+ <message>
+ <source>Cannot open for output</source>
+ <translation>無法開啟進行輸出</translation>
+ </message>
+</context>
+<context>
+ <name>QTDSDriver</name>
+ <message>
+ <source>Unable to open connection</source>
+ <translation>無法開啟連線</translation>
+ </message>
+ <message>
+ <source>Unable to use database</source>
+ <translation>無法使用資料庫</translation>
+ </message>
+</context>
+<context>
+ <name>AudioOutput</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>
+ </message>
+ <message>
+ <source>Revert back to device &apos;%1&apos;</source>
+ <translation>回復到裝置 &apos;%1&apos;</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>
+ </message>
+</context>
+<context>
+ <name>QPluginLoader</name>
+ <message>
+ <source>The plugin was not loaded.</source>
+ <translation>外掛程式未載入。</translation>
+ </message>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>QSlider</name>
+ <message>
+ <source>Page up</source>
+ <translation>頁面上方</translation>
+ </message>
+ <message>
+ <source>Position</source>
+ <translation>位置</translation>
+ </message>
+ <message>
+ <source>Page right</source>
+ <translation>頁面右方</translation>
+ </message>
+ <message>
+ <source>Page down</source>
+ <translation>頁面下方</translation>
+ </message>
+ <message>
+ <source>Page left</source>
+ <translation>頁面左方</translation>
+ </message>
+</context>
+<context>
+ <name>CloseButton</name>
+ <message>
+ <source>Close Tab</source>
+ <translation>關閉分頁</translation>
+ </message>
+</context>
+<context>
+ <name>QPSQLResult</name>
+ <message>
+ <source>Unable to prepare statement</source>
+ <translation>無法準備敘述</translation>
+ </message>
+ <message>
+ <source>Unable to create query</source>
+ <translation>無法建立查詢</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkAccessFileBackend</name>
+ <message>
+ <source>Request for opening non-local file %1</source>
+ <translation>要求開啟非本地端檔案 %1</translation>
+ </message>
+ <message>
+ <source>Read error reading from %1: %2</source>
+ <translation>從 %1 讀取錯誤：%2</translation>
+ </message>
+ <message>
+ <source>Cannot open %1: Path is a directory</source>
+ <translation>無法開啟 %1：此路徑是一個目錄</translation>
+ </message>
+ <message>
+ <source>Error opening %1: %2</source>
+ <translation>開啟 %1 發生錯誤：%2</translation>
+ </message>
+ <message>
+ <source>Write error writing to %1: %2</source>
+ <translation>寫入 %1 時發生錯誤：%2</translation>
+ </message>
+</context>
+<context>
+ <name>QNetworkReplyImpl</name>
+ <message>
+ <source>Operation canceled</source>
+ <translation>取消操作</translation>
+ </message>
+</context>
+<context>
+ <name>Q3NetworkProtocol</name>
+ <message>
+ <source>Operation stopped by the user</source>
+ <translation>使用者已中止操作</translation>
+ </message>
+</context>
+<context>
+ <name>QMdiArea</name>
+ <message>
+ <source>(Untitled)</source>
+ <translation>（未命名）</translation>
+ </message>
+</context>
+<context>
+ <name>QHostInfo</name>
+ <message>
+ <source>Unknown error</source>
+ <translation>未知的錯誤</translation>
+ </message>
+</context>
+<context>
+ <name>Q3Accel</name>
+ <message>
+ <source>%1, %2 not defined</source>
+ <translation>%1，%2 未定義</translation>
+ </message>
+ <message>
+ <source>Ambiguous %1 not handled</source>
+ <translation>不明確的 %1 尚未處理</translation>
+ </message>
+</context>
+<context>
+ <name>QTcpServer</name>
+ <message>
+ <source>Operation on socket is not supported</source>
+ <translation>Socket 的操作未被支援</translation>
+ </message>
+</context>
+</TS>

avidemux_2.7.0.tar.gz/avidemux/winInstaller/ChangeLog.release -> avidemux_2.7.1.tar.gz/avidemux/winInstaller/ChangeLog.release Changed

@@ -7,22 +7,33 @@
 </head>
 <body>
 <div id="inner">
- <h1>Changes in Avidemux v2.6.20/21 – v2.7.0</h1>
- <ul>
- <li>Core: <tab>FFmpeg switched to the 3.3.x branch</tab></li>
- <li>Editing: <tab>Fixed frame computation bug that led to bad cutting (euma)</tab></li>
- <li>i18n: <tab>Korean translation (sheppaul)</tab></li>
- <li>win32: <tab>Put log files into the local folder (achim71)</tab></li>
- <li>Jobs: <tab>Fix name of the executable search</tab></li>
- <li>UI: <tab>Steplessly zoom paused video when the window is resized (euma)</tab></li>
- <li>UI: <tab>Added Ctrl+Shift+C shortcut to copy the current PTS to clipboard (euma)</tab></li>
- <li>Filter: <tab>eq2: UI improvements (euma)</tab></li>
- <li>Decoding: <tab>Fix VP9 decoding</tab></li>
- <li>Filter: <tab>Using rubber bands for crop too (me+euma)</tab></li>
- <li>Build: <tab>Redone packaging on macOS</tab></li>
- <li>Decoding: <tab>HEVC decoding via DXVA2 blacklisted on win32, active on win64</tab></li>
- <li>New Filter: <tab>ADM ivtc</tab></li>
- <li>Audio: <tab>Distinguish between AC3 and EAC3 when importing</tab></li>
+ <h1>Changes in Avidemux v2.7.0 – v2.7.1</h1>
+ <table>
+ <tr><td>Encoder:</td><td>Add LibVA based HW accelerated H.264 encoder (Intel/Linux)</td></tr>
+ <tr><td>Decoder:</td><td>Fix last frames of video not retrieved from decoder</td></tr>
+ <tr><td>Decoder:</td><td>Implement hardware accelerated decoding of H.264 on macOS</td></tr>
+ <tr><td>Decoder:</td><td>Fix keyframe-based navigation in field-encoded MPEG-2 video</td></tr>
+ <tr><td>Demuxer:</td><td>Fix crash in the Matroska demuxer with high bitrate audio</td></tr>
+ <tr><td>Demuxer:</td><td>Fix too short duration reported for MKV and MP4 with B-frames</td></tr>
+ <tr><td>Demuxer:</td><td>Fix PTS delay calculation in the Matroska demuxer</td></tr>
+ <tr><td>Demuxer:</td><td>Fix audio delay ignored by the Mp4 demuxer</td></tr>
+ <tr><td>Muxer:</td><td>Improve resilience of FFmpeg based muxers against decode timestamps irregularities</td></tr>
+ <tr><td>Muxer:</td><td>Allow to force display aspect ratio in the configuration of the MP4 muxer</td></tr>
+ <tr><td>Muxer:</td><td>Fix crash in the AVI muxer on switch to OpenDML</td></tr>
+ <tr><td>Images:</td><td>Add PNG export, fix wrong colors with some colorspaces</td></tr>
+ <tr><td>Images:</td><td>Add feature to export selection as JPEG images</td></tr>
+ <tr><td>Editor:</td><td>Fix AVI with H.264 / HEVC without B-frames being not seekable</td></tr>
+ <tr><td>Editor:</td><td>Make AVI with H.264 / HEVC containing B-frames seekable by decoding the entire video</td></tr>
+ <tr><td>New Filter:</td><td>Still Image: generate video of specified duration out of a single image</td></tr>
+ <tr><td>Filter:</td><td>Make eq2 video filter partializable</td></tr>
+ <tr><td>Filter:</td><td>Implement fade-in / fade-out transition for "Add logo"</td></tr>
+ <tr><td>UI:</td><td>Display selection duration in the UI, move filter preview toggle to the toolbar</td></tr>
+ <tr><td>UI:</td><td>Warn right away if an edit would result in cuts being not on keyframes</td></tr>
+ <tr><td>UI:</td><td>Improve time chooser dialog</td></tr>
+ <tr><td>Audio:</td><td>Add Opus encoder</td></tr>
+ <tr><td>Audio:</td><td>Allow LPCM in FFmpeg-based muxers</td></tr>
+ <tr><td>Audio:</td><td>Show duration for external audio tracks</td></tr>
+ <tr><td>Miscellaneous:</td><td>Improved overall polish and stability</td></tr>
 </ul>
 </div>
 </body>

avidemux_2.7.0.tar.gz/avidemux/winInstaller/UAC.nsh -> avidemux_2.7.1.tar.gz/avidemux/winInstaller/UAC.nsh Changed

avidemux_2.7.0.tar.gz/avidemux/winInstaller/avidemux_cross32Qt5.nsi -> avidemux_2.7.1.tar.gz/avidemux/winInstaller/avidemux_cross32Qt5.nsi Changed

@@ -2,8 +2,8 @@
 # Included files
 ##########################
 !define BUILD_BITS 32
-!define ROOT_FOLDER /mingw/avidemux_32
-!define DEV_FOLDER  /mingw_dev/mingw/Release/
+#!define BINARY_FOLDER /mingw/avidemux_32
+#!define DEV_FOLDER  /mingw_dev/mingw/Release/
 !include avidemux_crossQt5.nsi
 
 Section "Avidemux Core" SecCore
@@ -13,85 +13,85 @@
     ${File} "./Build Info.txt"
     ${File} "./ChangeLog.html"
     ${File} "./change.css"
-    ${File} ${ROOT_FOLDER}/libexpat-1.dll
-    ${File} ${ROOT_FOLDER}/libffi-6.dll
-    ${File} ${ROOT_FOLDER}/libglib-2.0-0.dll
-    ${File} ${ROOT_FOLDER}/libgobject-2.0-0.dll
-    ${File} ${ROOT_FOLDER}/libharfbuzz-0.dll
-    ${File} ${ROOT_FOLDER}/libiconv-2.dll # MXE libiconv.dll
-    ${File} ${ROOT_FOLDER}/libpcre16-0.dll
-    ${File} ${ROOT_FOLDER}/libpcre-1.dll
-    #${File} ${ROOT_FOLDER}/libfaad-2.dll
-    #${File} ${ROOT_FOLDER}/libfaac-0.dll
-    ${File} ${ROOT_FOLDER}/libtwolame.dll
-    ${File} ${ROOT_FOLDER}/libbz2.dll
-    ${File} ${ROOT_FOLDER}/libpng16-16.dll
-    ${File} ${ROOT_FOLDER}/libsqlite3-0.dll
-    ${File} ${ROOT_FOLDER}/libstdc++-6.dll
-    ${File} ${ROOT_FOLDER}/libwinpthread-1.dll
-    ${File} ${ROOT_FOLDER}/libz-1.dll
-    ${File} ${ROOT_FOLDER}/zlib1.dll
-    ${File} ${ROOT_FOLDER}/libfreetype-6.dll
-    ${File} ${ROOT_FOLDER}/libgcc_s_sjlj-1.dll
-    ${File} ${ROOT_FOLDER}/SDL2.dll
+    ${File} ${BINARY_FOLDER}/libexpat-1.dll
+    ${File} ${BINARY_FOLDER}/libffi-6.dll
+    ${File} ${BINARY_FOLDER}/libglib-2.0-0.dll
+    ${File} ${BINARY_FOLDER}/libgobject-2.0-0.dll
+    ${File} ${BINARY_FOLDER}/libharfbuzz-0.dll
+    ${File} ${BINARY_FOLDER}/libiconv-2.dll # MXE libiconv.dll
+    ${File} ${BINARY_FOLDER}/libpcre16-0.dll
+    ${File} ${BINARY_FOLDER}/libpcre-1.dll
+    #${File} ${BINARY_FOLDER}/libfaad-2.dll
+    #${File} ${BINARY_FOLDER}/libfaac-0.dll
+    ${File} ${BINARY_FOLDER}/libtwolame.dll
+    ${File} ${BINARY_FOLDER}/libbz2.dll
+    ${File} ${BINARY_FOLDER}/libpng16-16.dll
+    ${File} ${BINARY_FOLDER}/libsqlite3-0.dll
+    ${File} ${BINARY_FOLDER}/libstdc++-6.dll
+    ${File} ${BINARY_FOLDER}/libwinpthread-1.dll
+    ${File} ${BINARY_FOLDER}/libz-1.dll
+    ${File} ${BINARY_FOLDER}/zlib1.dll
+    ${File} ${BINARY_FOLDER}/libfreetype-6.dll
+    ${File} ${BINARY_FOLDER}/libgcc_s_sjlj-1.dll
+    ${File} ${BINARY_FOLDER}/SDL2.dll
 # Qt
-    ${File} ${ROOT_FOLDER}/Qt5Core.dll  
-    ${File} ${ROOT_FOLDER}/Qt5Gui.dll  
-    ${File} ${ROOT_FOLDER}/Qt5Widgets.dll
-    ${File} ${ROOT_FOLDER}/Qt5Network.dll
-    ${File} ${ROOT_FOLDER}/Qt5OpenGL.dll
-    ${File} ${ROOT_FOLDER}/Qt5WinExtras.dll
-    #${File} ${ROOT_FOLDER}/icudt56.dll 
-    #${File} ${ROOT_FOLDER}/icuin56.dll  
-    #${File} ${ROOT_FOLDER}/icuio56.dll  
-    #${File} ${ROOT_FOLDER}/icule56.dll  
-    #${File} ${ROOT_FOLDER}/iculx56.dll  
-    #${File} ${ROOT_FOLDER}/icutu56.dll  
-    #${File} ${ROOT_FOLDER}/icuuc56.dll
-    ${File} ${ROOT_FOLDER}/libintl-8.dll
+    ${File} ${BINARY_FOLDER}/Qt5Core.dll  
+    ${File} ${BINARY_FOLDER}/Qt5Gui.dll  
+    ${File} ${BINARY_FOLDER}/Qt5Widgets.dll
+    ${File} ${BINARY_FOLDER}/Qt5Network.dll
+    ${File} ${BINARY_FOLDER}/Qt5OpenGL.dll
+    ${File} ${BINARY_FOLDER}/Qt5WinExtras.dll
+    #${File} ${BINARY_FOLDER}/icudt56.dll 
+    #${File} ${BINARY_FOLDER}/icuin56.dll  
+    #${File} ${BINARY_FOLDER}/icuio56.dll  
+    #${File} ${BINARY_FOLDER}/icule56.dll  
+    #${File} ${BINARY_FOLDER}/iculx56.dll  
+    #${File} ${BINARY_FOLDER}/icutu56.dll  
+    #${File} ${BINARY_FOLDER}/icuuc56.dll
+    ${File} ${BINARY_FOLDER}/libintl-8.dll
 # SSL
-    ${File} ${ROOT_FOLDER}/libeay32.dll
-    ${File} ${ROOT_FOLDER}/ssleay32.dll
+    ${File} ${BINARY_FOLDER}/libeay32.dll
+    ${File} ${BINARY_FOLDER}/ssleay32.dll
         
     SetOutPath $INSTDIR\platforms
-    ${File} ${ROOT_FOLDER}/platforms/qminimal.dll  
-    ${File} ${ROOT_FOLDER}/platforms/qwindows.dll
+    ${File} ${BINARY_FOLDER}/platforms/qminimal.dll  
+    ${File} ${BINARY_FOLDER}/platforms/qwindows.dll
     SetOutPath $INSTDIR
 # adm
-    ${File} ${ROOT_FOLDER}/libADM_audioParser6.dll
-    ${File} ${ROOT_FOLDER}/libADM_core6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudio6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudioDevice6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudioEncoder6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudioFilterAPI6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreDemuxer6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreDemuxerMpeg6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreImage6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreImageLoader6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreJobs.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreMuxer6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreScript.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreSocket6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreSqlLight3.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreUI6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreUtils6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreVideoCodec6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreVideoEncoder6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreVideoFilter6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreSubtitle.dll
-    ${File} ${NSIDIR}/../../AUTHORS.
-    ${File} ${NSIDIR}/../../COPYING.
-    ${File} ${NSIDIR}/../../README.
-    ${File} ${ROOT_FOLDER}/avcodec-*.dll
-    ${File} ${ROOT_FOLDER}/avformat-*.dll
-    ${File} ${ROOT_FOLDER}/avutil-*.dll
-    ${File} ${ROOT_FOLDER}/postproc-*.dll
-    ${File} ${ROOT_FOLDER}/swscale-*.dll
+    ${File} ${BINARY_FOLDER}/libADM_audioParser6.dll
+    ${File} ${BINARY_FOLDER}/libADM_core6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudio6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudioDevice6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudioEncoder6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudioFilterAPI6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreDemuxer6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreDemuxerMpeg6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreImage6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreImageLoader6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreJobs.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreMuxer6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreScript.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreSocket6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreSqlLight3.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreUI6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreUtils6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreVideoCodec6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreVideoEncoder6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreVideoFilter6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreSubtitle.dll
+    ${File} ${SOURCE_FOLDER}/AUTHORS.
+    ${File} ${SOURCE_FOLDER}/COPYING.
+    ${File} ${SOURCE_FOLDER}/README.
+    ${File} ${BINARY_FOLDER}/avcodec-*.dll
+    ${File} ${BINARY_FOLDER}/avformat-*.dll
+    ${File} ${BINARY_FOLDER}/avutil-*.dll
+    ${File} ${BINARY_FOLDER}/postproc-*.dll
+    ${File} ${BINARY_FOLDER}/swscale-*.dll
 
-    ${File} ${ROOT_FOLDER}/libfribidi*.dll
-    ${File} ${ROOT_FOLDER}/libfontconfig*.dll
-    ${File} ${ROOT_FOLDER}/libfreetype*.dll
-    ${File} ${ROOT_FOLDER}/libharfbuzz*.dll
+    ${File} ${BINARY_FOLDER}/libfribidi*.dll
+    ${File} ${BINARY_FOLDER}/libfontconfig*.dll
+    ${File} ${BINARY_FOLDER}/libfreetype*.dll
+    ${File} ${BINARY_FOLDER}/libharfbuzz*.dll
 
 	WriteRegStr HKLM "${REGKEY}" CreateDesktopIcon $CreateDesktopIcon
 	WriteRegStr HKLM "${REGKEY}" CreateStartMenuGroup $CreateStartMenuGroup

avidemux_2.7.0.tar.gz/avidemux/winInstaller/avidemux_cross64Qt5.nsi -> avidemux_2.7.1.tar.gz/avidemux/winInstaller/avidemux_cross64Qt5.nsi Changed

@@ -2,8 +2,8 @@
 # Included files
 ##########################
 !define BUILD_BITS 64
-!define ROOT_FOLDER /mingw/avidemux_64
-!define DEV_FOLDER  /mingw_dev/mingw/Release/
+#!define BINARY_FOLDER /mingw/avidemux_64
+#!define DEV_FOLDER  /mingw_dev/mingw/Release/
 !include avidemux_crossQt5.nsi
 
 Section "Avidemux Core" SecCore
@@ -13,76 +13,76 @@
     ${File} "./Build Info.txt"
     ${File} "./change.css"
     ${File} "./ChangeLog.html"
-    ${File} ${ROOT_FOLDER}/libexpat-1.dll
-    ${File} ${ROOT_FOLDER}/libffi-6.dll
-    ${File} ${ROOT_FOLDER}/libglib-2.0-0.dll
-    ${File} ${ROOT_FOLDER}/libgobject-2.0-0.dll
-    ${File} ${ROOT_FOLDER}/libharfbuzz-0.dll
-    ${File} ${ROOT_FOLDER}/libiconv-2.dll
-    ${File} ${ROOT_FOLDER}/libpcre16-0.dll
-    ${File} ${ROOT_FOLDER}/libpng16-16.dll
-    ${File} ${ROOT_FOLDER}/libsqlite3-0.dll
-    ${File} ${ROOT_FOLDER}/libstdc++-6.dll
-    ${File} ${ROOT_FOLDER}/libwinpthread-1.dll
-    ${File} ${ROOT_FOLDER}/libz-1.dll
-    ${File} ${ROOT_FOLDER}/libfreetype-6.dll
-    ${File} ${ROOT_FOLDER}/libgcc_s_seh-1.dll
-    ${File} ${ROOT_FOLDER}/libintl-8.dll
-    ${File} ${ROOT_FOLDER}/SDL2.dll
-    ${File} ${ROOT_FOLDER}/libfdk-aac-*.dll
+    ${File} ${BINARY_FOLDER}/libexpat-1.dll
+    ${File} ${BINARY_FOLDER}/libffi-6.dll
+    ${File} ${BINARY_FOLDER}/libglib-2.0-0.dll
+    ${File} ${BINARY_FOLDER}/libgobject-2.0-0.dll
+    ${File} ${BINARY_FOLDER}/libharfbuzz-0.dll
+    ${File} ${BINARY_FOLDER}/libiconv-2.dll
+    ${File} ${BINARY_FOLDER}/libpcre16-0.dll
+    ${File} ${BINARY_FOLDER}/libpng16-16.dll
+    ${File} ${BINARY_FOLDER}/libsqlite3-0.dll
+    ${File} ${BINARY_FOLDER}/libstdc++-6.dll
+    ${File} ${BINARY_FOLDER}/libwinpthread-1.dll
+    ${File} ${BINARY_FOLDER}/libz-1.dll
+    ${File} ${BINARY_FOLDER}/libfreetype-6.dll
+    ${File} ${BINARY_FOLDER}/libgcc_s_seh-1.dll
+    ${File} ${BINARY_FOLDER}/libintl-8.dll
+    ${File} ${BINARY_FOLDER}/SDL2.dll
+    ${File} ${BINARY_FOLDER}/libfdk-aac-*.dll
 # Qt
-    ${File} ${ROOT_FOLDER}/Qt5Core.dll  
-    ${File} ${ROOT_FOLDER}/Qt5Gui.dll  
-    ${File} ${ROOT_FOLDER}/Qt5OpenGL.dll
-    ${File} ${ROOT_FOLDER}/Qt5Widgets.dll
-    ${File} ${ROOT_FOLDER}/Qt5Network.dll
-    ${File} ${ROOT_FOLDER}/Qt5WinExtras.dll
-    #${File} ${ROOT_FOLDER}/libicudt51.dll 
-    #${File} ${ROOT_FOLDER}/libicuin51.dll  
-    #${File} ${ROOT_FOLDER}/libicuio51.dll  
-    #${File} ${ROOT_FOLDER}/libicule51.dll  
-    #${File} ${ROOT_FOLDER}/libiculx51.dll  
-    #${File} ${ROOT_FOLDER}/libicutu51.dll  
-    #${File} ${ROOT_FOLDER}/libicuuc51.dll
+    ${File} ${BINARY_FOLDER}/Qt5Core.dll  
+    ${File} ${BINARY_FOLDER}/Qt5Gui.dll  
+    ${File} ${BINARY_FOLDER}/Qt5OpenGL.dll
+    ${File} ${BINARY_FOLDER}/Qt5Widgets.dll
+    ${File} ${BINARY_FOLDER}/Qt5Network.dll
+    ${File} ${BINARY_FOLDER}/Qt5WinExtras.dll
+    #${File} ${BINARY_FOLDER}/libicudt51.dll 
+    #${File} ${BINARY_FOLDER}/libicuin51.dll  
+    #${File} ${BINARY_FOLDER}/libicuio51.dll  
+    #${File} ${BINARY_FOLDER}/libicule51.dll  
+    #${File} ${BINARY_FOLDER}/libiculx51.dll  
+    #${File} ${BINARY_FOLDER}/libicutu51.dll  
+    #${File} ${BINARY_FOLDER}/libicuuc51.dll
     SetOutPath $INSTDIR\platforms
-    ${File} ${ROOT_FOLDER}/platforms/qminimal.dll  
-    ${File} ${ROOT_FOLDER}/platforms/qwindows.dll
+    ${File} ${BINARY_FOLDER}/platforms/qminimal.dll  
+    ${File} ${BINARY_FOLDER}/platforms/qwindows.dll
     SetOutPath $INSTDIR
 # adm
-    ${File} ${ROOT_FOLDER}/libADM_audioParser6.dll
-    ${File} ${ROOT_FOLDER}/libADM_core6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudio6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudioDevice6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudioEncoder6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreAudioFilterAPI6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreDemuxer6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreDemuxerMpeg6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreImage6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreImageLoader6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreJobs.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreMuxer6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreScript.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreSocket6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreSqlLight3.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreUI6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreUtils6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreVideoCodec6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreVideoEncoder6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreVideoFilter6.dll
-    ${File} ${ROOT_FOLDER}/libADM_coreSubtitle.dll
-    ${File} ${NSIDIR}/../../AUTHORS.
-    ${File} ${NSIDIR}/../../COPYING.
-    ${File} ${NSIDIR}/../../README.
-    ${File} ${ROOT_FOLDER}/avcodec-*.dll
-    ${File} ${ROOT_FOLDER}/avformat-*.dll
-    ${File} ${ROOT_FOLDER}/avutil-*.dll
-    ${File} ${ROOT_FOLDER}/postproc-*.dll
-    ${File} ${ROOT_FOLDER}/swscale-*.dll
+    ${File} ${BINARY_FOLDER}/libADM_audioParser6.dll
+    ${File} ${BINARY_FOLDER}/libADM_core6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudio6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudioDevice6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudioEncoder6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreAudioFilterAPI6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreDemuxer6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreDemuxerMpeg6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreImage6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreImageLoader6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreJobs.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreMuxer6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreScript.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreSocket6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreSqlLight3.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreUI6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreUtils6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreVideoCodec6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreVideoEncoder6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreVideoFilter6.dll
+    ${File} ${BINARY_FOLDER}/libADM_coreSubtitle.dll
+    ${File} ${SOURCE_FOLDER}/AUTHORS.
+    ${File} ${SOURCE_FOLDER}/COPYING.
+    ${File} ${SOURCE_FOLDER}/README.
+    ${File} ${BINARY_FOLDER}/avcodec-*.dll
+    ${File} ${BINARY_FOLDER}/avformat-*.dll
+    ${File} ${BINARY_FOLDER}/avutil-*.dll
+    ${File} ${BINARY_FOLDER}/postproc-*.dll
+    ${File} ${BINARY_FOLDER}/swscale-*.dll
 
-    ${File} ${ROOT_FOLDER}/libfribidi*.dll
-    ${File} ${ROOT_FOLDER}/libfontconfig*.dll
-    ${File} ${ROOT_FOLDER}/libfreetype*.dll
-    ${File} ${ROOT_FOLDER}/libharfbuzz*.dll
+    ${File} ${BINARY_FOLDER}/libfribidi*.dll
+    ${File} ${BINARY_FOLDER}/libfontconfig*.dll
+    ${File} ${BINARY_FOLDER}/libfreetype*.dll
+    ${File} ${BINARY_FOLDER}/libharfbuzz*.dll
 
 
 	WriteRegStr HKLM "${REGKEY}" CreateDesktopIcon $CreateDesktopIcon

avidemux_2.7.0.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi -> avidemux_2.7.1.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi Changed

@@ -24,14 +24,14 @@
 !define EXEDIR "${NSIDIR}/install"
 
 !define PRODUCT_VERSION "${CORE_VERSION}.${POINT_RELEASE}.${SVN_VERSION}"
-!define PRODUCT_NAME "Avidemux ${CORE_VERSION} - ${BUILD_BITS} bits"
-!define PRODUCT_FULLNAME "Avidemux ${PRODUCT_VERSION} (${BUILD_BITS}-bit Release)"
+!define PRODUCT_NAME "Avidemux ${CORE_VERSION} - ${BUILD_BITS} bits${EXTRA}"
+!define PRODUCT_FULLNAME "Avidemux ${PRODUCT_VERSION} (${BUILD_BITS}-bits${EXTRA} Release)"
 
 !if ${BUILD_BITS} == 64
     !define SHORTCUT_NAME "${PRODUCT_NAME}"
-    !define REG_GROUPNAME "${PRODUCT_NAME} (${BUILD_BITS}-bit)"
+    !define REG_GROUPNAME "${PRODUCT_NAME} (${BUILD_BITS}-bit${EXTRA})"
 !else
-    !define SHORTCUT_NAME "${PRODUCT_NAME} (${BUILD_BITS}-bit)"
+    !define SHORTCUT_NAME "${PRODUCT_NAME} (${BUILD_BITS}-bit${EXTRA})"
     !define REG_GROUPNAME "${PRODUCT_NAME}"
 !endif
 
@@ -40,7 +40,7 @@
 !define COMPANY "Free Software Foundation"
 !define URL "http://www.avidemux.org"
 
-OutFile "${EXEDIR}/avidemux_${CORE_VERSION}.${POINT_RELEASE}_r${REVISION}_win${BUILD_BITS}.exe"
+OutFile "${BINARY_FOLDER}/avidemux_${CORE_VERSION}.${POINT_RELEASE}${EXTRA} r${REVISION}_win${BUILD_BITS}.exe"
 Name "${PRODUCT_FULLNAME}"
 
 ##########################
@@ -52,18 +52,18 @@
 ##########################
 # MUI defines
 ##########################
-!define MUI_ICON "${NSIDIR}/../common/xpm/adm.ico"
+!define MUI_ICON "${SOURCE_FOLDER}/avidemux/common/xpm/adm.ico"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
 !define MUI_HEADERIMAGE_BITMAP "${NSIDIR}/PageHeader.bmp"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${REGKEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Avidemux (${BUILD_BITS} bits)"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Avidemux (${BUILD_BITS} bits${EXTRA})"
 !define MUI_STARTMENUPAGE_NODISABLE
 !define MUI_WELCOMEFINISHPAGE_BITMAP "${NSIDIR}/WelcomeFinishStrip.bmp"
 !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSIDIR}/WelcomeFinishStrip.bmp"
-!define MUI_UNICON "${NSIDIR}/../common/xpm/adm.ico"
+!define MUI_UNICON "${SOURCE_FOLDER}/avidemux/common/xpm/adm.ico"
 !define MUI_COMPONENTSPAGE_NODESC
 
 ##########################
@@ -270,70 +270,70 @@
         SectionIn  1 2 RO
         SetOutPath $INSTDIR
         SetOverwrite on
-        ${File} ${ROOT_FOLDER}/avidemux_cli.exe
-        ${File} ${ROOT_FOLDER}/avidemux.exe
-        ${File} ${ROOT_FOLDER}/avidemux_jobs.exe
+        ${File} ${BINARY_FOLDER}/avidemux_cli.exe
+        ${File} ${BINARY_FOLDER}/avidemux.exe
+        ${File} ${BINARY_FOLDER}/avidemux_jobs.exe
         SetOutPath $INSTDIR\qt5\i18n
-        ${File} ${ROOT_FOLDER}/qt5/i18n/*.qm
+        ${File} ${BINARY_FOLDER}/qt5/i18n/*.qm
 SectionEnd
 # !!
 Section "Plugins" SecGrpPlugins
         SectionIn 1 2 RO
         SetOverwrite on
         SetOutPath $INSTDIR\plugins\audioDevices
-        ${File} ${ROOT_FOLDER}/plugins/audioDevices/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/audioDevices/*.dll
         SetOutPath $INSTDIR\plugins\audioDecoder
-        ${File} ${ROOT_FOLDER}/plugins/audioDecoder/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/audioDecoder/*.dll
         SetOutPath $INSTDIR\plugins\audioEncoders
-        ${File} ${ROOT_FOLDER}/plugins/audioEncoders/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/audioEncoders/*.dll
         SetOutPath $INSTDIR\plugins\demuxers
-        ${File} ${ROOT_FOLDER}/plugins/demuxers/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/demuxers/*.dll
         SetOutPath $INSTDIR\plugins\muxers
-        ${File} ${ROOT_FOLDER}/plugins/muxers/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/muxers/*.dll
         SetOutPath $INSTDIR\plugins\scriptEngines
-        ${File} ${ROOT_FOLDER}/plugins/scriptEngines/libADM_script_tinyPy.dll
+        ${File} ${BINARY_FOLDER}/plugins/scriptEngines/libADM_script_tinyPy.dll
         SetOutPath $INSTDIR\plugins\autoScripts
-        ${Folder} ${ROOT_FOLDER}/plugins/autoScripts
+        ${Folder} ${BINARY_FOLDER}/plugins/autoScripts
         SetOutPath $INSTDIR\plugins\videoEncoders
-        ${File} ${ROOT_FOLDER}/plugins/videoEncoders/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/videoEncoders/*.dll
         SetOutPath $INSTDIR\plugins\videoEncoders\qt5
-        ${File} ${ROOT_FOLDER}/plugins/videoEncoders/qt5/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/videoEncoders/qt5/*.dll
         #SetOutPath $INSTDIR\plugins\videoEncoders\cli
-        #${File} ${ROOT_FOLDER}/plugins/videoEncoders/cli/*.dll
+        #${File} ${BINARY_FOLDER}/plugins/videoEncoders/cli/*.dll
         SetOutPath $INSTDIR\plugins\videoFilters
-        ${File} ${ROOT_FOLDER}/plugins/videoFilters/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/videoFilters/*.dll
         SetOutPath $INSTDIR\plugins\videoFilters\qt5
-        ${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/videoFilters/qt5/*.dll
         SetOutPath $INSTDIR\plugins\videoFilters\cli
-        ${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/*.dll
+        ${File} ${BINARY_FOLDER}/plugins/videoFilters/cli/*.dll
         # Fonts
         SetOutPath $INSTDIR\etc\fonts
-        ${Folder} ${ROOT_FOLDER}/etc/fonts
+        ${Folder} ${BINARY_FOLDER}/etc/fonts
 SectionEnd
 Section "PluginsSettings" SecGrpPluginsSettings
         SectionIn 1 2 RO
         SetOverwrite on
         SetOutPath $INSTDIR\plugins\pluginSettings\x264\3
-        ${File} ${ROOT_FOLDER}/plugins/pluginSettings/x264/3/*.json
+        ${File} ${BINARY_FOLDER}/plugins/pluginSettings/x264/3/*.json
         #SetOutPath $INSTDIR\plugins\pluginSettings\x264\3
-        #${File} ${ROOT_FOLDER}/plugins/pluginSettings/x264/3/*.json
+        #${File} ${BINARY_FOLDER}/plugins/pluginSettings/x264/3/*.json
 SectionEnd
 # !!
 Section "Avisynth_VapourSynth" SecGrpAvisynth
         SectionIn 2
         SetOutPath $INSTDIR
         SetOverwrite on
-        ${File} ${ROOT_FOLDER}/avsproxy.exe
-        ${File} ${ROOT_FOLDER}/avsproxy_gui.exe
-        # TMP ${File} ${ROOT_FOLDER}/vsProxy.exe
-        # TMP ${File} ${ROOT_FOLDER}/vsProxy_gui_qt5.exe
+        ${File} ${BINARY_FOLDER}/avsproxy.exe
+        ${File} ${BINARY_FOLDER}/avsproxy_gui.exe
+        # TMP ${File} ${BINARY_FOLDER}/vsProxy.exe
+        # TMP ${File} ${BINARY_FOLDER}/vsProxy_gui_qt5.exe
 SectionEnd
 #
 Section "ShaderDemo" SecShaderDemo
         SectionIn  1 2 RO
         SetOutPath $INSTDIR\shaderDemo
         SetOverwrite on
-        ${File} ${ROOT_FOLDER}/plugins/shaderDemo/1/*.shader # FIXME
+        ${File} ${BINARY_FOLDER}/plugins/shaderDemo/1/*.shader # FIXME
 SectionEnd
 #
 #
@@ -341,7 +341,7 @@
         SectionIn  1 2 RO
         SetOutPath $INSTDIR
         SetOverwrite on
-        ${File} ${ROOT_FOLDER}/*.dll
+        ${File} ${BINARY_FOLDER}/*.dll
 SectionEnd
 #
 Section "SDK (to write plugins)" SecGrpDev

avidemux_2.7.1.tar.gz/avidemux/winInstaller/avidemux_nativeQt5Tail.nsi Added

@@ -0,0 +1,495 @@
+
+${MementoSection} "-Start menu Change Log" SecStartMenuChangeLog
+    CreateDirectory $SMPROGRAMS\$StartMenuGroup
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    SetOutPath $INSTDIR
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Change Log ${CORE_VERSION}.lnk" "$INSTDIR\ChangeLog.html"
+    !insertmacro MUI_STARTMENU_WRITE_END
+${MementoSectionEnd}
+
+
+${MementoSection} "-Start menu Qt" SecStartMenuQt
+    CreateDirectory $SMPROGRAMS\$StartMenuGroup
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    SetOutPath $INSTDIR
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\${SHORTCUT_NAME}.lnk" $INSTDIR\avidemux.exe
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Avidemux job control (${BUILD_BITS} Bits).lnk" $INSTDIR\avidemux_jobs.exe
+    !insertmacro MUI_STARTMENU_WRITE_END
+${MementoSectionEnd}
+
+${MementoSection} "-Start menu AVS Proxy GUI" SecStartMenuAvsProxyGui
+    CreateDirectory $SMPROGRAMS\$StartMenuGroup
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    SetOutPath $INSTDIR
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\AVS Proxy GUI ${CORE_VERSION}.lnk" "$INSTDIR\avsproxy_gui.exe"
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\VS Proxy GUI ${CORE_VERSION}.lnk" "$INSTDIR\vsProxy_gui_qt5.exe"
+    !insertmacro MUI_STARTMENU_WRITE_END
+${MementoSectionEnd}
+
+
+${MementoSection} "-Quick Launch Qt" SecQuickLaunchQt
+    SetOutPath $INSTDIR
+    CreateShortcut "$QUICKLAUNCH\${SHORTCUT_NAME}.lnk" $INSTDIR\avidemux.exe
+${MementoSectionEnd}
+
+
+${MementoSection} "-Desktop Qt" SecDesktopQt
+    SetOutPath $INSTDIR
+    CreateShortcut "$DESKTOP\${SHORTCUT_NAME}.lnk" $INSTDIR\avidemux.exe
+${MementoSectionEnd}
+
+${MementoSectionDone}
+
+Section -post SecUninstaller
+    SectionIn 1 2
+    WriteRegStr HKLM "${REGKEY}" Path $INSTDIR
+    WriteRegStr HKLM "${REGKEY}" Version ${PRODUCT_VERSION}
+    SetOutPath $INSTDIR
+    WriteUninstaller $INSTDIR\uninstall.exe
+    WriteRegStr HKLM "${UNINST_REGKEY}" DisplayName "${SHORTCUT_NAME}"
+    WriteRegStr HKLM "${UNINST_REGKEY}" DisplayVersion "${PRODUCT_VERSION}"
+    WriteRegStr HKLM "${UNINST_REGKEY}" DisplayIcon $INSTDIR\uninstall.exe
+    WriteRegStr HKLM "${UNINST_REGKEY}" UninstallString $INSTDIR\uninstall.exe
+    WriteRegDWORD HKLM "${UNINST_REGKEY}" NoModify 1
+    WriteRegDWORD HKLM "${UNINST_REGKEY}" NoRepair 1
+SectionEnd
+
+Section -CloseLogFile
+	FileClose $UninstallLogHandle
+	SetFileAttributes ${UninstallLogPath} HIDDEN
+SectionEnd
+ 
+Section Uninstall
+	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup	
+
+
+    Delete /REBOOTOK "$QUICKLAUNCH\${SHORTCUT_NAME}.lnk"
+    Delete /REBOOTOK "$DESKTOP\${SHORTCUT_NAME}.lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\${SHORTCUT_NAME}.lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Avidemux job control (${BUILD_BITS} Bits).lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Change Log ${CORE_VERSION}.lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\AVS Proxy GUI ${CORE_VERSION}.lnk"
+    RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
+    DeleteRegValue HKLM "${REGKEY}" StartMenuGroup
+    
+    DeleteRegKey HKLM "${UNINST_REGKEY}"
+    DeleteRegValue HKLM "${REGKEY}" Path
+	DeleteRegValue HKLM "${REGKEY}" CreateDesktopIcon
+	DeleteRegValue HKLM "${REGKEY}" CreateStartMenuGroup
+	DeleteRegValue HKLM "${REGKEY}" CreateQuickLaunchIcon
+    DeleteRegKey /IfEmpty HKLM "${REGKEY}"
+
+	FileOpen $UninstallLogHandle "${UninstallLogPath}" r
+UninstallLoop:
+    ClearErrors
+    FileRead $UninstallLogHandle $R0
+    IfErrors UninstallEnd
+	Push $R0
+    Call un.TrimNewLines
+    Pop $R0
+    Delete "$R0"
+    Goto UninstallLoop
+UninstallEnd:
+	FileClose $UninstallLogHandle
+	Delete "${UninstallLogPath}"
+	Delete "$INSTDIR\uninstall.exe"
+	Push "\"
+	Call un.RemoveEmptyDirs
+	RMDir "$INSTDIR"
+SectionEnd
+
+##########################
+# Installer functions
+##########################
+Function .onInit
+UAC_Elevate:
+	!insertmacro UAC_RunElevated
+	StrCmp 1223 $0 UAC_ElevationAborted
+	StrCmp 0 $0 0 UAC_Err
+	StrCmp 1 $1 0 UAC_Success
+	Quit
+
+UAC_Err:
+	MessageBox MB_ICONSTOP "Unable to elevate, error $0"
+	Abort
+
+UAC_ElevationAborted:
+	Abort
+
+UAC_Success:
+	StrCmp 1 $3 +4
+	StrCmp 3 $1 0 UAC_ElevationAborted
+	MessageBox MB_ICONSTOP "This installer requires admin access."
+	Goto UAC_Elevate
+
+	Call LoadPreviousSettings
+	ReadRegStr $PreviousVersion HKLM "${REGKEY}" Version
+
+	${If} $PreviousVersion != ""
+		${VersionCompare} ${PRODUCT_VERSION} $PreviousVersion $PreviousVersionState
+	${EndIf}
+	
+    InitPluginsDir
+    SetShellVarContext all
+FunctionEnd
+
+Function .onInstSuccess
+	${MementoSectionSave}
+FunctionEnd
+
+Function LoadPreviousSettings
+    ${MementoSectionRestore}
+	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+
+	ReadRegStr $CreateStartMenuGroup HKLM "${REGKEY}" CreateStartMenuGroup
+
+	${If} $CreateStartMenuGroup == ""
+		StrCpy $CreateStartMenuGroup 1
+	${EndIf}
+
+	ReadRegStr $CreateDesktopIcon HKLM "${REGKEY}" CreateDesktopIcon
+
+	${If} $CreateDesktopIcon == ""
+		StrCpy $CreateDesktopIcon 1
+	${EndIf}
+
+	${If} ${AtMostWinVista}
+		ReadRegStr $CreateQuickLaunchIcon HKLM "${REGKEY}" CreateQuickLaunchIcon
+
+		${If} $CreateQuickLaunchIcon == ""
+			StrCpy $CreateQuickLaunchIcon 1
+		${EndIf}
+	${EndIf}
+
+FunctionEnd
+
+Function RunUninstaller
+    ReadRegStr $R1  HKLM "${UNINST_REGKEY}" "UninstallString"
+
+	${If} $R1 == ""
+		Return
+	${EndIf}
+
+	;Run uninstaller
+	HideWindow
+	ClearErrors
+	
+	${If} $PreviousVersionState == 0
+	${AndIf} $ReinstallUninstall == 1
+		ExecWait '$R1 _?=$INSTDIR'
+	${Else}
+		ExecWait '$R1 /frominstall _?=$INSTDIR'
+	${EndIf}
+
+	IfErrors NoRemoveUninstaller
+	IfFileExists "$INSTDIR\uninstall.exe" 0 NoRemoveUninstaller
+		Delete "$R1"
+		RMDir $INSTDIR
+
+NoRemoveUninstaller:
+FunctionEnd
+
+Function CheckSelectedUIs
+	!insertmacro SectionFlagIsSet ${SecGrpUI} ${SF_SELECTED} end checkPartial
+checkPartial:
+	!insertmacro SectionFlagIsSet ${SecGrpUI} ${SF_PSELECTED} end displayError
+displayError:
+    MessageBox MB_OK|MB_ICONSTOP "At least one User Interface must be selected."
+    Abort
+end:
+FunctionEnd
+
+LangString INSTALL_OPTS_PAGE_TITLE ${LANG_ENGLISH} "Choose Install Options"
+LangString INSTALL_OPTS_PAGE_SUBTITLE ${LANG_ENGLISH} "Choose where to install Avidemux icons."
+Var dlgInstallOptions
+Var lblCreateIcons
+Var chkDesktop
+Var chkStartMenu
+Var chkQuickLaunch
+
+Function InstallOptionsPage
+	Call IsInstallOptionsRequired
+	!insertmacro MUI_HEADER_TEXT "$(INSTALL_OPTS_PAGE_TITLE)" "$(INSTALL_OPTS_PAGE_SUBTITLE)"
+
+	nsDialogs::Create 1018
+	Pop $dlgInstallOptions
+
+	${If} $dlgInstallOptions == error
+		Abort
+	${EndIf}
+
+	${NSD_CreateLabel} 0 0u 100% 12u "Create icons for Avidemux:"
+	Pop $lblCreateIcons
+
+	${NSD_CreateCheckBox} 0 18u 100% 12u "On my &Desktop"
+	Pop $chkDesktop
+	${NSD_SetState} $chkDesktop $CreateDesktopIcon
+	${NSD_OnClick} $chkDesktop UpdateInstallOptions
+
+	${NSD_CreateCheckBox} 0 36u 100% 12u "In my &Start Menu Programs folder"
+	Pop $chkStartMenu
+	${NSD_SetState} $chkStartMenu $CreateStartMenuGroup
+	${NSD_OnClick} $chkStartMenu UpdateInstallOptions
+
+	${If} ${AtMostWinVista}
+		${NSD_CreateCheckBox} 0 54u 100% 12u "In my &Quick Launch bar"
+		Pop $chkQuickLaunch
+		${NSD_SetState} $chkQuickLaunch $CreateQuickLaunchIcon
+		${NSD_OnClick} $chkQuickLaunch UpdateInstallOptions
+	${EndIf}
+  	#${If} ${IsWin2003}
+		#WriteRegStr HKCU "Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" "$INSTDIR\avidemux.exe" "WIN2000"
+	#${EndIf}
+  	#${If} ${IsWinXp}
+		#WriteRegStr HKCU "Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" "$INSTDIR\avidemux.exe" "WIN2000"
+	#${EndIf}
+	nsDialogs::Show
+FunctionEnd
+
+Function UpdateInstallOptions
+	${NSD_GetState} $chkDesktop $CreateDesktopIcon
+	${NSD_GetState} $chkStartMenu $CreateStartMenuGroup
+	${NSD_GetState} $chkQuickLaunch $CreateQuickLaunchIcon
+FunctionEnd
+
+Function IsInstallOptionsRequired
+Goto end
+	!insertmacro SectionFlagIsSet ${SecGrpUI} ${SF_SELECTED} end resetOptions
+resetOptions:
+
+    StrCpy $CreateDesktopIcon 0
+    StrCpy $CreateStartMenuGroup 0
+    StrCpy $CreateQuickLaunchIcon 0
+    Abort
+
+end:
+FunctionEnd
+
+Function IsStartMenuRequired
+    StrCmp $CreateStartMenuGroup 1 +2
+        Abort
+FunctionEnd
+
+Function ActivateInternalSections
+    #AVS Proxy GUI shortcut:
+    SectionGetFlags ${SecGrpAvisynth} $0
+    IntOp $0 $0 & ${SF_SELECTED}
+    IntOp $0 $0 & $CreateStartMenuGroup
+    SectionSetFlags ${SecGrpAvisynth} $0
+
+    #Change Log shortcut:
+    SectionSetFlags ${SecStartMenuChangeLog} $CreateStartMenuGroup
+
+    #Qt shortcuts:
+    SectionGetFlags ${SecGrpUI} $0
+    IntOp $0 $0 & ${SF_SELECTED}
+
+    IntOp $1 $0 & $CreateDesktopIcon
+    SectionSetFlags ${SecDesktopQt} $1
+
+    IntOp $1 $0 & $CreateQuickLaunchIcon
+    SectionSetFlags ${SecQuickLaunchQt} $1
+
+    IntOp $1 $0 & $CreateStartMenuGroup
+    SectionSetFlags ${SecStartMenuQt} $1
+FunctionEnd
+
+Function InstFilesPageShow
+	${If} $ReinstallUninstall != ""
+		Call RunUninstaller
+		BringToFront
+	${EndIf}
+FunctionEnd
+
+Function InstFilesPageLeave
+	; Don't advance automatically if details expanded
+	FindWindow $R0 "#32770" "" $HWNDPARENT
+	GetDlgItem $R0 $R0 1016
+	System::Call user32::IsWindowVisible(i$R0)i.s
+	Pop $R0
+
+	StrCmp $R0 0 +2
+	SetAutoClose false
+FunctionEnd
+
+Function ConfigureFinishPage
+
+    SectionGetFlags ${SecGrpUI} $0
+    IntOp $0 $0 & ${SF_SELECTED}
+    StrCmp $0 ${SF_SELECTED} end
+
+    DeleteINISec "$PLUGINSDIR\ioSpecial.ini" "Field 4"
+
+end:
+FunctionEnd
+
+Function RunAvidemux
+    SetOutPath $INSTDIR
+
+    SectionGetFlags ${SecGrpUI} $0
+    IntOp $0 $0 & ${SF_SELECTED}
+
+	!insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\avidemux.exe" "" "" ""
+
+    Goto end
+
+
+end:
+FunctionEnd
+
+Var ReinstallUninstallButton
+
+Function ReinstallPage
+	${If} $PreviousVersion == ""
+		Abort
+	${EndIf}
+
+	nsDialogs::Create /NOUNLOAD 1018
+	Pop $0
+
+	${If} $PreviousVersionState == 1
+		!insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${PRODUCT_FULLNAME}."
+		nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "An older version of Avidemux is installed on your system.  Select the operation you want to perform and click Next to continue."
+		Pop $R0
+		nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Upgrade Avidemux using previous settings (recommended)"
+		Pop $ReinstallUninstallButton
+		nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"
+		Pop $R0
+
+		${If} $ReinstallUninstall == ""
+			StrCpy $ReinstallUninstall 1
+		${EndIf}
+	${ElseIf} $PreviousVersionState == 2
+		!insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${PRODUCT_FULLNAME}."
+		nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "A newer version of Avidemux is already installed! It is not recommended that you downgrade to an older version. Select the operation you want to perform and click Next to continue."
+		Pop $R0
+		nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Downgrade Avidemux using previous settings (recommended)"
+		Pop $ReinstallUninstallButton
+		nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"
+		Pop $R0
+
+		${If} $ReinstallUninstall == ""
+			StrCpy $ReinstallUninstall 1
+		${EndIf}
+	${ElseIf} $PreviousVersionState == 0
+		!insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
+		nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "${PRODUCT_FULLNAME} is already installed. Select the operation you want to perform and click Next to continue."
+		Pop $R0
+		nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Add/Remove/Reinstall components"
+		Pop $R0
+		nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Uninstall Avidemux"
+		Pop $ReinstallUninstallButton
+
+		${If} $ReinstallUninstall == ""
+			StrCpy $ReinstallUninstall 2
+		${EndIf}
+	${Else}
+		MessageBox MB_ICONSTOP "Unknown value of PreviousVersionState, aborting" /SD IDOK
+		Abort
+	${EndIf}
+
+	${If} $ReinstallUninstall == "1"
+		SendMessage $ReinstallUninstallButton ${BM_SETCHECK} 1 0
+	${Else}
+		SendMessage $R0 ${BM_SETCHECK} 1 0
+	${EndIf}
+
+	nsDialogs::Show
+FunctionEnd
+
+Function ReinstallPageLeave
+	SendMessage $ReinstallUninstallButton ${BM_GETCHECK} 0 0 $R0
+
+	${If} $R0 == 1
+		; Option to uninstall old version selected
+		StrCpy $ReinstallUninstall 1
+	${Else}
+		; Custom up/downgrade or add/remove/reinstall
+		StrCpy $ReinstallUninstall 2
+	${EndIf}
+
+	${If} $ReinstallUninstall == 1
+		${If} $PreviousVersionState == 0
+			Call RunUninstaller
+			Quit
+		${Else}
+			; Need to reload defaults. User could have
+			; chosen custom, change something, went back and selected
+			; the express option.
+			Call LoadPreviousSettings
+		${EndIf}
+	${EndIf}
+FunctionEnd
+
+
+##########################
+# Uninstaller functions
+##########################
+; TrimNewlines (copied from NSIS documentation)
+; input, top of stack  (e.g. whatever$/r$/n)
+; output, top of stack (replaces, with e.g. whatever)
+; modifies no other variables.
+Function un.TrimNewlines
+	Exch $R0
+	Push $R1
+	Push $R2
+	StrCpy $R1 0
+
+loop:
+	IntOp $R1 $R1 - 1
+	StrCpy $R2 $R0 1 $R1
+	StrCmp $R2 "$\r" loop
+	StrCmp $R2 "$\n" loop
+	IntOp $R1 $R1 + 1
+	IntCmp $R1 0 no_trim_needed
+	StrCpy $R0 $R0 $R1
+
+no_trim_needed:
+	Pop $R2
+	Pop $R1
+	Exch $R0
+FunctionEnd
+ 
+Function un.RemoveEmptyDirs
+	Pop $9
+	!define Index 'Line${__LINE__}'
+	FindFirst $0 $1 "$INSTDIR$9*"
+	StrCmp $0 "" "${Index}-End"
+"${Index}-Loop:"
+	StrCmp $1 "" "${Index}-End"
+	StrCmp $1 "." "${Index}-Next"
+	StrCmp $1 ".." "${Index}-Next"
+	Push $0
+	Push $1
+	Push $9
+	Push "$9$1\"
+	Call un.RemoveEmptyDirs
+	Pop $9
+	Pop $1
+	Pop $0
+;"${Index}-Remove:"
+	RMDir "$INSTDIR$9$1"
+"${Index}-Next:"
+	FindNext $0 $1
+	Goto "${Index}-Loop"
+"${Index}-End:"
+	FindClose $0
+	!undef Index
+FunctionEnd
+
+Function un.ConfirmPagePre
+	${un.GetParameters} $R0
+	${un.GetOptions} $R0 "/frominstall" $R1
+	${Unless} ${Errors}
+		Abort
+	${EndUnless}
+FunctionEnd
+
+Function un.FinishPagePre
+	${un.GetParameters} $R0
+	${un.GetOptions} $R0 "/frominstall" $R1
+	${Unless} ${Errors}
+		SetRebootFlag false
+		Abort
+	${EndUnless}
+FunctionEnd

avidemux_2.7.1.tar.gz/avidemux/winInstaller/avidemux_nativeVcQt5.nsi Added

@@ -0,0 +1,98 @@
+##########################
+# Included files
+##########################
+!define BUILD_BITS 64
+!include "avidemux_nativeQt5Common.nsi"
+
+Section "Avidemux Core" SecCore
+    SectionIn 1 2 RO
+    SetOutPath $INSTDIR
+    SetOverwrite on
+    ${File} "Build Info.txt"
+    ${File} "change.css"
+    ${File} "ChangeLog.html"
+
+    ${File} ${BINARY_FOLDER}\aften.dll
+    ${File} ${BINARY_FOLDER}\avcodec-57.dll
+    ${File} ${BINARY_FOLDER}\avdevice-57.dll
+    ${File} ${BINARY_FOLDER}\avformat-57.dll
+    ${File} ${BINARY_FOLDER}\avutil-55.dll
+    ${File} ${BINARY_FOLDER}\fdk-aac-1.dll
+    ${File} ${BINARY_FOLDER}\libwinpthread-1.dll
+    ${File} ${BINARY_FOLDER}\libx264-146.dll
+    ${File} ${BINARY_FOLDER}\libx265.dll
+    ${File} ${BINARY_FOLDER}\libz-1.dll
+    ${File} ${BINARY_FOLDER}\msvcp140.dll
+    ${File} ${BINARY_FOLDER}\opus.dll
+    ${File} ${BINARY_FOLDER}\postproc-54.dll
+    ${File} ${BINARY_FOLDER}\Qt5Core.dll
+    ${File} ${BINARY_FOLDER}\Qt5Gui.dll
+    ${File} ${BINARY_FOLDER}\Qt5Network.dll
+    ${File} ${BINARY_FOLDER}\Qt5OpenGL.dll
+    ${File} ${BINARY_FOLDER}\Qt5Widgets.dll
+    ${File} ${BINARY_FOLDER}\Qt5WinExtras.dll
+    ${File} ${BINARY_FOLDER}\sqlite3.dll
+    ${File} ${BINARY_FOLDER}\swscale-4.dll
+    ${File} ${BINARY_FOLDER}\twolame.dll
+    ${File} ${BINARY_FOLDER}\vcruntime140.dll
+    ${File} ${BINARY_FOLDER}\zlibd.dll
+    ${File} ${BINARY_FOLDER}\zlib.dll
+   
+# QT
+    ${File} ${BINARY_FOLDER}\Qt5Core.dll
+    ${File} ${BINARY_FOLDER}\Qt5Gui.dll
+    ${File} ${BINARY_FOLDER}\Qt5Network.dll
+    ${File} ${BINARY_FOLDER}\Qt5OpenGL.dll
+    ${File} ${BINARY_FOLDER}\Qt5Widgets.dll
+    ${File} ${BINARY_FOLDER}\Qt5WinExtras.dll
+    SetOutPath $INSTDIR\platforms
+    ${File} ${BINARY_FOLDER}\platforms\qminimal.dll  
+    ${File} ${BINARY_FOLDER}\platforms\qwindows.dll
+    SetOutPath $INSTDIR
+# adm
+    ${File} ${BINARY_FOLDER}\ADM_audioParser6.dll
+    ${File} ${BINARY_FOLDER}\ADM_core6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreAudio6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreAudioDevice6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreAudioEncoder6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreAudioFilterAPI6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreDemuxer6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreDemuxerMpeg6.dll
+    #${File} ${BINARY_FOLDER}\ADM_coreDxva26.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreImage6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreImageLoader6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreJobs.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreMuxer6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreScript.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreSocket6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreSqlLight3.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreSubtitle.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreUI6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreUtils6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreVideoCodec6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreVideoEncoder6.dll
+    ${File} ${BINARY_FOLDER}\ADM_coreVideoFilter6.dll
+    ${File} ${BINARY_FOLDER}\*ADM_openGLQT56.dll
+    ${File} ${BINARY_FOLDER}\*ADM_render6_cli.dll
+    ${File} ${BINARY_FOLDER}\*ADM_render6_QT5.dll
+    ${File} ${BINARY_FOLDER}\*ADM_UI_Cli6.dll
+    ${File} ${BINARY_FOLDER}\*ADM_UIQT56.dll
+    ${File} ${BINARY_FOLDER}\*ADM_coreDxva26.dll
+    ${File} ${BINARY_FOLDER}\libADM_openGLQT56.dll
+    ${File} ${BINARY_FOLDER}\libADM_render6_cli.dll
+    ${File} ${BINARY_FOLDER}\libADM_render6_QT5.dll
+    ${File} ${BINARY_FOLDER}\libADM_UI_Cli6.dll
+    ${File} ${BINARY_FOLDER}\libADM_UIQT56.dll
+    ${File} ${NSIDIR}\..\..\AUTHORS.
+    ${File} ${NSIDIR}\..\..\COPYING.
+    ${File} ${NSIDIR}\..\..\README.
+   
+
+	WriteRegStr HKLM "${REGKEY}" CreateDesktopIcon $CreateDesktopIcon
+	WriteRegStr HKLM "${REGKEY}" CreateStartMenuGroup $CreateStartMenuGroup
+
+	${If} ${AtMostWinVista}
+		WriteRegStr HKLM "${REGKEY}" CreateQuickLaunchIcon $CreateQuickLaunchIcon
+	${EndIf}
+SectionEnd
+!include avidemux_nativeQt5Tail.nsi

avidemux_2.7.0.tar.gz/avidemux/winInstaller/change.css.release -> avidemux_2.7.1.tar.gz/avidemux/winInstaller/change.css.release Changed

avidemux_2.7.1.tar.gz/avidemux/winInstaller/createCrossNsisQt5.sh Added

avidemux_2.7.1.tar.gz/avidemux/winInstaller/createNativeNsisQt564Vc.sh Added

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -x
+export REV="0"
+export NSIS="/c/Program Files (x86)/NSIS/makensis.exe"
+export TOP_FOLDER="$1"
+export INSTALLER_FOLDER="${TOP_FOLDER}/avidemux/winInstaller"
+# SetCompressor /SOLID lzma
+mkdir -p install
+rm -f install/*
+# Except 
+export tmp="/tmp/tmp.$$"
+export tmp2="/tmp/tmp2.$$"
+cat ${INSTALLER_FOLDER}/avidemux_crossQt5.nsi  
+cat ${INSTALLER_FOLDER}/avidemux_crossQt5.nsi  | sed 's/\//\\/g'  | sed 's/\\SOLID/\/SOLID/g' | sed 's/dll\.a/lib/g' > $tmp
+cat $tmp | sed 's/^.*autoScripts.*$//g' | sed 's/^.*etc.fonts.*$//g' > $tmp2
+cat $tmp2 | sed 's/^.*avsproxy.exe.*$//g' | sed 's/^.*vs[pP]roxy.*.exe.*$//g' > ${INSTALLER_FOLDER}/avidemux_nativeQt5Common.nsi
+#cp  ${INSTALLER_FOLDER}/avidemux_nativeVcQt5.nsi avidemux_nativeVcQt5r.nsi 
+cp  ${INSTALLER_FOLDER}/avidemux_nativeQt5Tail.nsi .
+#cp  ${INSTALLER_FOLDER}/*.nsh .
+#cp -r ${INSTALLER_FOLDER}/plugin .
+
+
+echo "Creating NSIS Package"
+mkdir -p install
+rm -f install/*
+#touch "Build Info.txt"
+#touch "ChangeLog.html"
+#touch "change.css"
+"${NSIS}"  -DAPI_VERSION=2.7  -DEXTRA=" VC++"  -DNSIDIR=${INSTALLER_FOLDER} -DSOURCE_FOLDER=${TOP_FOLDER}  -DDEV_FOLDER="$2" -DBINARY_FOLDER="$2" ${INSTALLER_FOLDER}/avidemux_nativeVcQt5.nsi -V4
+echo "Done"

avidemux_2.7.1.tar.gz/avidemux/winInstaller/old Added

avidemux_2.7.1.tar.gz/avidemux/winInstaller/old/avidemux.nsi Changed

avidemux_2.7.1.tar.gz/avidemux/winInstaller/old/avidemux_cross.nsi Changed

avidemux_2.7.1.tar.gz/avidemux/winInstaller/old/avidemux_cross64.nsi Changed

avidemux_2.7.1.tar.gz/avidemux/winInstaller/old/createNsis.sh Changed

avidemux_2.7.1.tar.gz/avidemux/winInstaller/old/createNsis64.sh Changed

avidemux_2.7.0.tar.gz/avidemux2.desktop -> avidemux_2.7.1.tar.gz/avidemux2.desktop Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStream.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStream.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStreamMP3.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStreamMP3.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp Changed

@@ -55,7 +55,7 @@
 ADM_info("\t no sync\n");
 return false;
 }
- if(INVALID_OFFSET==offset) offset=syncoff;
+ if(INVALID_OFFSET==offset || syncoff>offset) offset=syncoff;
 // Skip this packet
 int next=probeIndex+syncoff+mp2info.size;
 len=limit-next;
@@ -184,43 +184,56 @@
 uint32_t syncOffset;
 ADM_EAC3_INFO info,info2;
 
- if( !ADM_EAC3GetInfo(data,bufferSize, &syncOffset,&info))
+ if( !ADM_EAC3GetInfo(data, bufferSize, &syncOffset, &info, false))
 {
- ADM_info("Not EAC3\n");
- return false;
- };
- // Need a 2nd packet...
- const uint8_t *second=data+syncOffset+info.frameSizeInBytes;
- int size2=bufferSize-syncOffset;
- ADM_assert(size2>0);
- ADM_info("Maybe EAC3... \n");
- // Try with 6 packets
+ ADM_info("Not EAC3\n");
+ return false;
+ }
+
+ // Need 2 more frames to be sure...
 bool r=true;
+ uintptr_t tmp=(uintptr_t)data;
+ int size2=bufferSize;
+ const uint32_t max_byterate_deviation=1000;
+
 for(int i=0;i<2;i++)
 {
 ADM_info("\t pass %d\n",i);
- if( !ADM_EAC3GetInfo(second,size2, &syncOffset,&info2))
+ size2-=info.frameSizeInBytes+syncOffset;
+ ADM_assert(size2>0);
+ tmp+=syncOffset+info.frameSizeInBytes;
+ const uint8_t *data2=(uint8_t *)tmp;
+
+ if( !ADM_EAC3GetInfo(data2, size2, &syncOffset, &info2, false))
 {
 ADM_info("Cannot sync (pass %d)\n",i);
+ return false;
+ }
+ ADM_info("byterate = %" PRIu32" (pass %d)\n",info2.byterate,i);
+ if(info.frequency!=info2.frequency || info.channels!=info2.channels)
+ {
+ ADM_info("Info doesn't match (pass %d)\n",i);
 r=false;
 break;
 }
- if((info.frequency!=info2.frequency) || (info.channels!=info2.channels) || (info.byterate!=info2.byterate))
+ if(info.byterate>info2.byterate+max_byterate_deviation || info.byterate+max_byterate_deviation<info2.byterate)
 {
- ADM_info("Not same infos (pass %d)\n",i);
+ ADM_info("Byterate variance too high: %d (limit = %d)\n",
+ (info.byterate>info2.byterate ? (int)(info.byterate-info2.byterate) : (int)(info2.byterate-info.byterate)),
+ (int)max_byterate_deviation);
 r=false;
 break;
 }
- if(syncOffset)
+ if(syncOffset>2)
 {
- ADM_info("Offset between packets (pass %d)\n",i);
+ ADM_info("Offset between frames too big = %" PRIu32" (pass %d)\n",syncOffset,i);
 r=false;
 break;
 }
 }
- if(r) 
+ if(r)
 {
- ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels,syncOffset);
+ ADM_info("\tProbably EAC3 : freq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels,(int)syncOffset);
 oinfo.encoding=WAV_EAC3;
 oinfo.channels=info.channels;
 oinfo.byterate=info.byterate; // already in bytes/sec
@@ -230,45 +243,70 @@
 {
 ADM_info("Cannot confirm EAC3\n");
 }
- return r; 
+ return r;
 }
 
 /**
 \fn idAC3
- \brief return true if the tracks is mp2
+ \brief return true if the track is AC3
 */
-static bool idAC3(int bufferSize,const uint8_t *data,WAVHeader &info,uint32_t &offset)
+static bool idAC3(int bufferSize,const uint8_t *data,WAVHeader &oinfo,uint32_t &offset)
 {
- uint32_t fq,br,chan,syncoff;
- uint32_t fq2,br2,chan2,syncoff2;
+ uint32_t syncOffset;
+ ADM_EAC3_INFO info,info2;
 
- if( !ADM_AC3GetInfo(data,bufferSize, &fq, &br, &chan,&syncoff))
+ if( !ADM_EAC3GetInfo(data, bufferSize, &syncOffset, &info, true))
 {
- ADM_info("Not ac3\n");
- return false;
+ ADM_info("Not AC3\n");
+ return false;
 }
- offset=syncoff;
- // Need a 2nd packet...
- const uint8_t *second=data+syncoff;
- int size2=bufferSize-syncoff;
- ADM_assert(size2>0);
- ADM_info("Maybe AC3... \n");
- // Try on 2nd packet...
- if( ADM_AC3GetInfo(second,size2, &fq2, &br2, &chan2,&syncoff2))
+
+ // Need 2 more frames to be sure...
+ bool r=true;
+ uintptr_t tmp=(uintptr_t)data;
+ int size2=bufferSize;
+
+ for(int i=0;i<2;i++)
 {
- if((fq==fq2) && (br2==br) && (chan==chan2))
+ ADM_info("\t pass %d\n",i);
+ size2-=info.frameSizeInBytes+syncOffset;
+ ADM_assert(size2>0);
+ tmp+=syncOffset+info.frameSizeInBytes;
+ const uint8_t *data2=(uint8_t *)tmp;
+
+ if( !ADM_EAC3GetInfo(data2, size2, &syncOffset, &info2, true))
 {
- ADM_warning("\tProbably AC3 : Fq=%d br=%d chan=%d\n",(int)fq,(int)br,(int)chan);
- info.encoding=WAV_AC3;
- info.channels=chan;
- info.byterate=br; // already in bytes/sec
- info.frequency=fq;
- return true;
+ ADM_info("Cannot sync (pass %d)\n",i);
+ return false;
+ }
+ if(info.frequency!=info2.frequency || info.channels!=info2.channels || info.byterate!=info2.byterate)
+ {
+ ADM_info("Info doesn't match (pass %d)\n",i);
+ r=false;
+ break;
+ }
+ if(syncOffset>2)
+ {
+ ADM_info("Offset between frames too big = %" PRIu32" (pass %d)\n",syncOffset,i);
+ r=false;
+ break;
 }
 }
- ADM_info("Cannot confirm ac3\n");
- return false;
+ if(r)
+ {
+ ADM_info("\tProbably AC3 : freq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels,(int)syncOffset);
+ oinfo.encoding=WAV_AC3;
+ oinfo.channels=info.channels;
+ oinfo.byterate=info.byterate; // already in bytes/sec
+ oinfo.frequency=info.frequency;
+ return true;
+ }else
+ {
+ ADM_info("Cannot confirm AC3\n");
+ }
+ return r;
 }
+
 /**
 * 
 * @param bufferSize
@@ -331,8 +369,6 @@
 if(idEAC3(bufferSize,buffer,info,offset)) return true;
 if(idAC3(bufferSize,buffer,info,offset)) return true;
 if(idAAACADTS(bufferSize,buffer,info,offset)) return true;
- if(idAC3(bufferSize,buffer,info,offset)) return true;
- 
 
 return false;
 }

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp Changed

@@ -23,6 +23,10 @@
 */
 ADM_audioStreamMP3::ADM_audioStreamMP3(WAVHeader *header,ADM_audioAccess *access,bool createMap) : ADM_audioStreamBuffered(header,access)
 {
+ // Suppress repeated debug messages
+ _msg_counter=0;
+ _msg_ratelimit=new ADMCountdown(200);
+ _msg_ratelimit->reset();
 // If hinted..., compute the duration ourselves
 if(access->isCBR()==true && access->canSeekOffset()==true)
 {
@@ -43,13 +47,14 @@
 if(true==createMap)
 {
 buildTimeMap();
+ uint32_t nb=seekPoints.size();
+ if(nb)
+ durationInUs=seekPoints[nb-1]->timeStamp;
 return;
 }
 }
 // Time based
 durationInUs=access->getDurationInUs();
- 
-
 }
 
 /**
@@ -64,6 +69,9 @@
 delete seekPoints[i];
 seekPoints[i]=NULL;
 }
+ if(_msg_ratelimit)
+ delete _msg_ratelimit;
+ _msg_ratelimit = NULL;
 }
 /**
 \fn goToTime
@@ -88,7 +96,7 @@
 // if VBR use our time map
 if(!seekPoints.size())
 {
- ADM_error("VBR MP2/MP3 stream with no time map, cannot seek");
+ ADM_error("VBR MP2/MP3 stream with no time map, cannot seek\n");
 return false;
 }
 if(nbUs<=seekPoints[0]->timeStamp) // too early
@@ -112,7 +120,7 @@
 return true;
 }
 }
- ADM_error("VBR MP2/MP3 request for time outside of time map, cannot seek");
+ ADM_error("VBR MP2/MP3 request for time outside of time map, cannot seek\n");
 return false;
 }
 /**
@@ -130,8 +138,22 @@
 // Do we have enough ? Refill if needed ?
 if(needBytes(ADM_LOOK_AHEAD)==false) 
 {
- ADM_warning("MP3: Not enough data to lookup header\n");
- return 0;
+ if(_msg_ratelimit->done())
+ {
+ if(_msg_counter)
+ {
+ ADM_warning("MP3: Not enough data to lookup header (message repeated %" PRIu32" times)\n",_msg_counter);
+ _msg_counter=0;
+ }else
+ {
+ ADM_warning("MP3: Not enough data to lookup header\n");
+ }
+ _msg_ratelimit->reset();
+ }else
+ {
+ _msg_counter++;
+ }
+ return 0;
 }
 // Peek
 peek(ADM_LOOK_AHEAD,data);
@@ -150,6 +172,7 @@
 //printf("%"PRId64" , size=%d\n",*dts,*size);
 if(nbSyncBytes)
 ADM_info("[MP3 Stream] Sync found after %d bytes...\n",nbSyncBytes);
+ _msg_counter=0;
 return 1;
 }
 
@@ -177,7 +200,7 @@
 
 ADM_assert(access->canSeekOffset()==true);
 access->setPos(0);
- printf("[audioStreamMP3] Starting time map\n");
+ ADM_info("Starting MP3 time map\n");
 rewind();
 Clock *clk=new Clock();
 clk->reset();
@@ -248,7 +271,7 @@
 delete work;
 delete clk;
 access->setPos(0);
- printf("[audioStreamMP3] Ending time map\n");
+ ADM_info("Finishing MP3 time map\n");
 return true;
 }

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_eac3info.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_eac3info.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp Changed

@@ -87,8 +87,8 @@
 {
 if(!hasExtra)
 {
- ADM_error("No extradata in aac! using default of 48 kHz");
- return 48000;
+ ADM_error("No extradata in aac! using default of 48 kHz\n");
+ return 48000;
 }
 uint8_t *p=extra;
 int dex=((p[0]&7)<<1)+(p[1]>>7);
@@ -102,8 +102,8 @@
 {
 if(!hasExtra)
 {
- ADM_error("No extradata in aac! using default of 2 channels");
- return 2;
+ ADM_error("No extradata in aac! using default of 2 channels\n");
+ return 2;
 }
 uint8_t *p=extra;
 int dex=((p[1]>>3)&0xf);
@@ -144,7 +144,7 @@
 {
 ADM_error("Head=%d tail=%d bufferSize=%d\n",head,tail,ADTS_BUFFER_SIZE*2);
 ADM_error("Adts buffer overflow\n");
- ADM_assert(0);
+ return false;
 }
 memcpy(buffer.at(head),inData,incomingLen);
 head+=incomingLen;
@@ -160,11 +160,8 @@
 */
 ADM_adts2aac::ADTS_STATE ADM_adts2aac::getAACFrame(int *outLen,uint8_t *out,int *offset)
 {
- bool r=false;
 if(outLen)
 *outLen=0;
- // ok , done
- aprintf("********** LOOP (incoming =%d)*******\n",incomingLen);
 again:
 aprintf("[ADTS] *** head=%d tail=%d size=%d***\n",head,tail,head-tail);
 if(tail+7>head) // we neeed at least 7 bytes...
@@ -191,7 +188,7 @@
 {
 crc=true;
 }
- if(nbFrames!=1) continue;
+ if(!packetLen || nbFrames!=1) continue;
 aprintf("[ADTS] Packet len=%d, nbframes=%d\n",packetLen,nbFrames);
 aprintf("[ADTS] Found sync at offset %d, buffer size=%d\n",(int)(p-buffer.at(0)),(int)(head-tail));
 aprintf("[ADTS] Dropping %d bytes\n",(int)(p-buffer.at(0)-tail));
@@ -203,7 +200,7 @@
 }
 if(match+packetLen+2>head && match+packetLen!=head)
 {
- aprintf("[ADTS]** not enough data, r=%d **\n",(int)r);
+ aprintf("[ADTS]** not enough data **\n");
 return ADTS_MORE_DATA_NEEDED;
 }
 // do we have sync at the end ?
@@ -250,7 +247,7 @@
 }
 //
 //---------
- if(!produced)
+ if(produced<1)
 {
 tail=match+1;
 aprintf("[ADTS] No data produced\n");
@@ -278,10 +275,13 @@
 
 ADM_adts2aac::ADTS_STATE ADM_adts2aac::convert2(int incomingLen,const uint8_t *inData,int *outLen,uint8_t *out)
 {
- bool r=false;
 *outLen=0;
+ bool r=false;
 if(incomingLen)
- addData(incomingLen,inData);
- return getAACFrame(outLen,out);
+ r=addData(incomingLen,inData);
+ ADTS_STATE state=getAACFrame(outLen,out);
+ if(!r && state==ADTS_MORE_DATA_NEEDED)
+ return ADTS_ERROR;
+ return state;
 }
 //EOF

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp Changed

@@ -20,12 +20,10 @@
 /**
 \fn ADM_EAC3GetInfo
 */
-bool ADM_EAC3GetInfo(const uint8_t *buf, uint32_t len, uint32_t *syncoff,ADM_EAC3_INFO *info)
+bool ADM_EAC3GetInfo(const uint8_t *buf, uint32_t len, uint32_t *syncoff, ADM_EAC3_INFO *info, bool plainAC3)
 {
-uint32_t l;
-uint32_t of=0;
-
- *syncoff=of=0;
+ uint32_t of=0;
+ *syncoff=0;
 //	printf("\n Syncing on %d \n",len);
 // Search for startcode
 // 0x0b 0x77
@@ -33,15 +31,15 @@
 {
 if(len<7)
 {
- printf("Not enough info to find a52 syncword\n");
- return 0;
+ ADM_warning("Not enough info to find a52 syncword\n");
+ return false;
 }
 if( *buf!=0x0b || *(buf+1)!=0x77)
 {
- len--;
- buf++;
- of++;
- continue;
+ len--;
+ buf++;
+ of++;
+ continue;
 }
 AC3HeaderInfo *hdr=NULL;
 GetBitContext gb;
@@ -51,13 +49,23 @@
 len--;
 buf++;
 of++;
- printf("Sync failed..continuing\n");
+ ADM_info("Sync failed... continuing\n");
 continue;
 }
- if(hdr->bitstream_id<=10) // this is not EAC3 but plain ac3
+ 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;
 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;
+ return false;
+ }
 // printf("Sync found at offset %"PRIu32"\n",of);
 *syncoff=of;
 info->frequency=(uint32_t)hdr->sample_rate;
@@ -67,7 +75,7 @@
 info->samples=265*6; // ??
 av_free(hdr);
 hdr=NULL;
- return 1;
+ return true;
 }
- return 1;	
+ return true;
 }

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_Video.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_Video.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h Changed

@@ -132,6 +132,7 @@
                                     ADMImage(uint32_t width, uint32_t height,ADM_IMAGE_TYPE type);
                     bool            saveAsBmpInternal(const char *filename);
                     bool            saveAsJpgInternal(const char *filename);
+                    bool            saveAsPngInternal(const char *filename);
 public:
                      bool            hwIncRefCount(void);
                      bool            hwDecRefCount(void);
@@ -159,12 +160,12 @@
         bool    blacken(void);
         bool    copyTo(ADMImage *target, uint32_t x, uint32_t y);
         bool    copyToAlpha(ADMImage *target, uint32_t x, uint32_t y,uint32_t alpha);
-        bool    copyWithAlphaChannel(ADMImage *target, uint32_t x, uint32_t y);
+        bool    copyWithAlphaChannel(ADMImage *target, uint32_t x, uint32_t y, uint32_t opacity=255);
         bool    copyLeftSideTo(ADMImage *dest);
         /* Some utilitarian functions */
         bool    saveAsBmp(const char *filename);
-
         bool    saveAsJpg(const char *filename);
+        bool    saveAsPng(const char *filename);
         bool    printString(uint32_t x,uint32_t y, const char *strng);
 static  bool    copyPlane(ADMImage *s, ADMImage *d, ADM_PLANE plane);

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp Changed

@@ -229,13 +229,18 @@
 * @return 
 */
 
-static bool blitWithAlpha(uint8_t *dst, uint8_t *src, uint8_t *alpha,int dstStride, int srcStride,int alphaStride,int w,int h, int mul)
+static bool blitWithAlpha(uint8_t *dst, uint8_t *src, uint8_t *alpha, int dstStride, int srcStride, int alphaStride, int w, int h, int mul, uint32_t opacity)
 {
 for(int k=0;k<h;k++)
 {
 for(int j=0;j<w;j++)
 {
 int a=alpha[mul*j];
+ if(opacity<255)
+ {
+ a*=opacity;
+ a>>=8;
+ }
 uint32_t x=(255-a)*dst[j]+a*src[j];
 dst[j]=x>>8;
 }
@@ -245,9 +250,8 @@
 }
 return true;
 }
-bool ADMImage::copyWithAlphaChannel(ADMImage *dest, uint32_t x,uint32_t y)
+bool ADMImage::copyWithAlphaChannel(ADMImage *dest, uint32_t x,uint32_t y,uint32_t opacity)
 {
-
 uint32_t box_w=_width, box_h=_height;
 // Clip if needed
 if(y>dest->_height)
@@ -293,7 +297,7 @@
 dstPitches[i], 
 srcPitches[i], 
 alphaStride,
- ww,hh,mul);
+ ww,hh,mul,opacity);
 }
 return 1;
 }

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp Changed

@@ -79,8 +79,23 @@
 // ADM_dealloc(out);
 return 0;
 }
- ADMColorScalerSimple converter(bmph.biWidth, bmph.biHeight, ADM_COLOR_YV12,ADM_COLOR_RGB24);
- converter.convertImage(this,out);
+
+ // swap U & V planes first
+ int xss[3], xds[3];
+ uint8_t *xsp[3], *xdp[3];
+ xss[0] = this->GetPitch(PLANAR_Y);
+ xss[1] = this->GetPitch(PLANAR_V);
+ xss[2] = this->GetPitch(PLANAR_U);
+ xsp[0] = this->GetReadPtr(PLANAR_Y);
+ xsp[1] = this->GetReadPtr(PLANAR_V);
+ xsp[2] = this->GetReadPtr(PLANAR_U);
+ xds[0] = bmph.biWidth*3;
+ xds[1] = xds[2] = 0;
+ xdp[0] = out;
+ xdp[1] = xdp[2] = NULL;
+
+ ADMColorScalerSimple converter(bmph.biWidth, bmph.biHeight, ADM_COLOR_YV12, ADM_COLOR_BGR24);
+ converter.convertPlanes(xss,xds,xsp,xdp);
 uint32_t ww=bmph.biWidth;
 uint32_t hh=bmph.biHeight;
 uint8_t *swap = new uint8_t[ww*3];
@@ -163,7 +178,7 @@
 AVFrame *frame=NULL;
 bool result=false;
 AVCodec *codec=NULL;
-int sz=0,r=0;
+int r=0;
 ADM_byteBuffer byteBuffer;
 
 frame=av_frame_alloc();
@@ -202,12 +217,14 @@
 return false;
 }
 // Setup our image & stuff....
- 
+ frame->width=_width;
+ frame->height=_height;
+ frame->format=AV_PIX_FMT_YUV420P;
+
+ frame->linesize[0] = GetPitch(PLANAR_Y);
+ frame->linesize[2] = GetPitch(PLANAR_U);
+ frame->linesize[1] = GetPitch(PLANAR_V);
 
- frame->linesize[0] = GetPitch(PLANAR_Y); 
- frame->linesize[1] = GetPitch(PLANAR_U); 
- frame->linesize[2] = GetPitch(PLANAR_V); 
- 
 frame->data[0] = GetWritePtr(PLANAR_Y);
 frame->data[2] = GetWritePtr(PLANAR_U);
 frame->data[1] = GetWritePtr(PLANAR_V);
@@ -265,10 +282,139 @@
 return result;
 }
 
+/**
+ \fn saveAsPngInternal
+ \brief save current image into filename in PNG format
+*/
+bool ADMImage::saveAsPngInternal(const char *filename)
+{
+ AVCodecContext *context=NULL;
+ AVFrame *frame=NULL;
+ AVCodec *codec=NULL;
+ bool result=false;
+ int sz=_width*_height*3, r=0;
+ uint8_t *out;
+ int xss[3], xds[3];
+ uint8_t *xsp[3], *xdp[3];
+ ADMColorScalerSimple converter(_width, _height, ADM_COLOR_YV12, ADM_COLOR_RGB24);
+ ADM_byteBuffer byteBuffer;
+
+ frame=av_frame_alloc();
+ if(!frame)
+ {
+ ADM_error("Cannot allocate frame\n");
+ goto __cleanup;
+ }
+
+ codec=avcodec_find_encoder(AV_CODEC_ID_PNG);
+ if(!codec)
+ {
+ ADM_error("Cannot allocate codec\n");
+ goto __cleanup;
+ }
+
+ context=avcodec_alloc_context3(codec);
+ if(!context)
+ {
+ ADM_error("Cannot allocate context\n");
+ goto __cleanup;
+ }
+
+ context->pix_fmt=AV_PIX_FMT_RGB24;
+ context->strict_std_compliance = -1;
+ context->time_base.den=1;
+ context->time_base.num=1;
+ context->width=_width;
+ context->height=_height;
+
+ r=avcodec_open2(context, codec, NULL);
+ if(r<0)
+ {
+ ADM_error("Cannot combine codec and context\n");
+ ADM_dealloc(context);
+ return false;
+ }
+
+ // swap U & V planes first
+ out=(uint8_t *)ADM_alloc(sz);
+ xss[0] = this->GetPitch(PLANAR_Y);
+ xss[1] = this->GetPitch(PLANAR_V);
+ xss[2] = this->GetPitch(PLANAR_U);
+ xsp[0] = this->GetReadPtr(PLANAR_Y);
+ xsp[1] = this->GetReadPtr(PLANAR_V);
+ xsp[2] = this->GetReadPtr(PLANAR_U);
+ xds[0] = _width*3;
+ xds[1] = xds[2] = 0;
+ xdp[0] = out;
+ xdp[1] = xdp[2] = NULL;
+
+ // convert colorspace
+ converter.convertPlanes(xss,xds,xsp,xdp);
+
+ // setup AVFrame
+ frame->width = _width;
+ frame->height = _height;
+ frame->format = AV_PIX_FMT_RGB24;
+
+ frame->linesize[0] = _width*3;
+ frame->linesize[1] = 0;
+ frame->linesize[2] = 0;
+
+ frame->data[0] = out;
+ frame->data[1] = NULL;
+ frame->data[2] = NULL;
+
+ // Grab a temp buffer
+ byteBuffer.setSize(sz);
+
+ // Encode
+ AVPacket pkt;
+ av_init_packet(&pkt);
+ int gotSomething;
+ pkt.size=sz;
+ pkt.data=byteBuffer.at(0);
+ r=avcodec_encode_video2(context,&pkt,frame,&gotSomething);
+ if(r || !gotSomething)
+ {
+ ADM_error("Error %d encoding image\n",r);
+ goto __cleanup;
+ }
+
+ // Ok now write our file...
+ {
+ FILE *f=ADM_fopen(filename,"wb");
+ if(f)
+ {
+ fwrite(byteBuffer.at(0),pkt.size,1,f);
+ fclose(f);
+ result=true;
+ }else
+ {
+ ADM_error("Cannot open %s for writing!\n",filename);
+ }
+ }
+
+__cleanup:
+ // Cleanup
+ if(context)
+ {
+ avcodec_close(context);
+ av_free(context);
+ context=NULL;
+ }
+
+ if(frame)
+ {
+ av_frame_free(&frame);
+ frame=NULL;
+ }
+
+ return result;
+}
 
 /**
- \fn saveAsBmp
- \brief save current image into filename, into bmp format
+ \fn saveAsJpg
+ \brief save current image into filename, into JPEG format
 */
 bool ADMImage::saveAsJpg(const char *filename)
 {
@@ -282,3 +428,20 @@
 return clone.saveAsJpgInternal(filename);
 
 }
+
+/**
+ \fn saveAsPng
+ \brief save current image into filename in PNG format
+*/
+bool ADMImage::saveAsPng(const char *filename)
+{
+ if(refType==ADM_HW_NONE)
+ return saveAsPngInternal(filename);
+
+ ADMImageDefault clone(_width, _height);
+
+ clone.duplicateFull(this);
+ clone.hwDownloadFromRef();
+ return clone.saveAsPngInternal(filename);
+
+}

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp Changed

@@ -18,6 +18,7 @@
 ***************************************************************************/
 
 #include "ADM_default.h"
+#include "ADM_vidMisc.h"
 #include "fourcc.h"
 #include "ADM_coreMuxerFfmpeg.h"
 #include "ADM_muxerUtils.h"
@@ -353,10 +354,20 @@
 par->frame_size=1152;
 par->codec_id = AV_CODEC_ID_MP3;
 break;
+ case WAV_LPCM:
 case WAV_PCM:
+ if(audioheader->encoding==WAV_LPCM)
+ {
+ // One chunk is 10 ms (1/100 of fq)
+ par->frame_size=4;
+ par->codec_id = AV_CODEC_ID_PCM_S16BE;break;
+ }
+ else
+ {
 // One chunk is 10 ms (1/100 of fq)
 par->frame_size=4;
 par->codec_id = AV_CODEC_ID_PCM_S16LE;break;
+ }
 case WAV_AAC:
 ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
 par->codec_id = AV_CODEC_ID_AAC;
@@ -433,9 +444,10 @@
 uint8_t *buffer=new uint8_t[bufSize];
 uint64_t rawDts;
 uint64_t lastVideoDts=0;
+ uint64_t lastVideoDtsLav=0;
 uint64_t videoIncrement;
- int ret;
- int written=0;
+ bool ret;
+ uint32_t written=0;
 bool result=true;
 int missingPts=0;
 
@@ -478,22 +490,44 @@
 rawDts=out.dts;
 if(rawDts==ADM_NO_PTS)
 {
+ ADM_warning("No DTS information for frame %" PRIu32"\n",written);
 lastVideoDts+=videoIncrement;
+ }else if(lastVideoDts && rawDts<=lastVideoDts)
+ {
+ ADM_warning("Duplicated or going back DTS for frame %" PRIu32", adding %" PRIu64" ms\n",written,(videoIncrement/2)/1000);
+ lastVideoDts+=videoIncrement/2;
+ out.dts=lastVideoDts;
 }else
 {
 lastVideoDts=out.dts;
 }
+
 if(out.pts==ADM_NO_PTS)
 {
 ADM_warning("No PTS information for frame %" PRIu32"\n",written);
 missingPts++;
 out.pts=lastVideoDts;
 }
-
+ if(out.pts<lastVideoDts)
+ {
+ ADM_warning("Bumping PTS to keep PTS >= DTS for frame %" PRIu32"\n",written);
+ out.pts=lastVideoDts;
+ }
 
 encoding->pushVideoFrame(out.len,out.out_quantizer,lastVideoDts);
 muxerRescaleVideoTimeDts(&(out.dts),lastVideoDts);
+ if(!roundup && lastVideoDtsLav && out.dts==lastVideoDtsLav)
+ {
+ ADM_warning("Bumping lav DTS to avoid collision for frame %" PRIu32"\n",written);
+ out.dts++;
+ }
+ lastVideoDtsLav=out.dts;
 muxerRescaleVideoTime(&(out.pts));
+ if(out.dts>out.pts)
+ {
+ ADM_warning("Bumping lav PTS to keep PTS >= DTS for frame %" PRIu32"\n",written);
+ out.pts=out.dts;
+ }
 aprintf("[FF:V] RawDts:%lu Scaled Dts:%lu\n",rawDts,out.dts);
 aprintf("[FF:V] Rescaled: Len : %d flags:%x Pts:%" PRIu64" Dts:%" PRIu64"\n",out.len,out.flags,out.pts,out.dts);
 
@@ -589,9 +623,16 @@
 
 }
 delete [] buffer;
- if((videoDuration *4)/5 > lastVideoDts)
+ if(false==ret)
 {
- GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Too short"), QT_TRANSLATE_NOOP("adm","The video has been saved but seems to be incomplete."));
+ char msg[512+1];
+ snprintf(msg,512,QT_TRANSLATE_NOOP("adm",
+ "The saved video is incomplete. "
+ "The error occured at %s (%d\%). "
+ "This may happen as result of invalid time stamps in the video."),
+ ADM_us2plain(lastVideoDts),
+ (int)(lastVideoDts*100/videoDuration));
+ GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Too short"),msg);
 result=false;
 }
 ADM_info("[FF] Wrote %d frames, nb audio streams %d\n",written,nbAStreams);

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp Changed

@@ -108,8 +108,20 @@
 if(mySocket)
 {
 int er;
-		er=shutdown(mySocket,SCLOSE);
- if(er) ADM_error("[ADMSocket]Error when socket shutdown %d (socket %d)\n",er,mySocket);
+ er=shutdown(mySocket,SCLOSE);
+ if(er)
+ {
+#ifdef _WIN32
+ ADM_error("Error %d on socket shutdown (socket %d)\n",er,mySocket);
+#else
+#ifdef __APPLE__
+ if(errno==ENOTCONN)
+ ADM_info("Ignoring ENOTCONN on socket shutdown on macOS\n");
+ else
+#endif
+ ADM_error("Error %d on socket shutdown (socket %d)\n",errno,mySocket);
+#endif
+ }
 mySocket=0;
 }
 return 1;
@@ -169,9 +181,9 @@
 }
 /**
 \fn createBindAndAccept
- \brief bind to any port and accept incoming packets
+ \brief try to bind to the port specified by the caller and accept incoming packets
 */
-bool ADM_socket::createBindAndAccept(uint32_t *port)
+bool ADM_socket::createBindAndAccept(uint32_t *port)
 {
 if(!create())
 {
@@ -179,45 +191,43 @@
 return false;
 }
 #ifndef _WIN32
-int enable = 1;
-if (setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0)
- ADM_error("Oops : setsockopt(SO_REUSEADDR) failed\n");
+ int enable = 1;
+ if (setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0)
+ ADM_error("Oops : setsockopt(SO_REUSEADDR) failed\n");
 #endif
 
- ADM_info("Binding on %s:%d\n",BIND_ADR,*port);
- sockaddr_in service;
- service.sin_family = AF_INET;
- service.sin_addr.s_addr = inet_addr(BIND_ADR);
- service.sin_port = htons(*port); // bind to any port
+ ADM_info("Binding on %s:%" PRIu32"\n",BIND_ADR,*port);
+ sockaddr_in service;
+ service.sin_family = AF_INET;
+ service.sin_addr.s_addr = inet_addr(BIND_ADR);
+ service.sin_port = htons(*port); // if *port = 0, bind to any port
 
- if (bind( mySocket, (SADDR *)&service, sizeof(service))) 
- {
-		ADM_error("bind() failed \n");
-		fflush(stdout);
-		close();
-		return false;
- }
- // Get port 
+ if (bind( mySocket, (SADDR *)&service, sizeof(service)))
+ {
+ ADM_error("bind() failed\n");
+ fflush(stdout);
+ close();
+ return false;
+ }
+ // Get port
 SSOCKLEN len=sizeof( service);
- if ( getsockname ( mySocket, (SADDR *)& service, &len ) < 0 ) 
+ if ( getsockname ( mySocket, (SADDR *)& service, &len ) < 0 )
 {
 ADM_error("Getsockname failed\n");
 fflush(stdout);
 close();
 return false;
 }
- *port= ntohs ( ((SADDR_IN *)&service)->sin_port ); 
- 
- // Set high buffer + low delay
- ADM_info("Socket bound to port %u\n",(unsigned int)*port);
+ *port= ntohs ( ((SADDR_IN *)&service)->sin_port );
+ ADM_info("Socket bound to port %" PRIu32"\n",*port);
 
 int er=listen(mySocket,1);
-	if(er)
-	{
-		ADM_error("Error in listen\n");
-		fflush(stdout);
+ if(er)
+ {
+ ADM_error("Error in listen\n");
+ fflush(stdout);
 return false;
-	}
+ }
 
 return true;
 }

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h Changed

@@ -2,7 +2,6 @@
 FEATURES_SWAP_IF_A_GREATER_THAN_B, 	//bool
 FEATURES_SAVEPREFSONEXIT, 	//bool
 FEATURES_IGNORESAVEDMARKERS, 	//bool
-FEATURES_USE_ODML, 	//bool
 FEATURES_REUSE_2PASS_LOG, 	//bool
 FEATURES_AUDIOBAR_USES_MASTER, 	//bool
 FEATURES_THREADING_LAVC, 	//uint32_t
@@ -13,11 +12,13 @@
 FEATURES_VDPAU, 	//bool
 FEATURES_XVBA, 	//bool
 FEATURES_LIBVA, 	//bool
+FEATURES_VIDEOTOOLBOX, 	//bool
 FEATURES_ENABLE_OPENGL, 	//bool
 FEATURES_CAP_REFRESH_ENABLED, 	//bool
 FEATURES_CAP_REFRESH_VALUE, 	//uint32_t
 FEATURES_SDLDRIVER, 	//string
 FEATURES_USE_LAST_READ_DIR_AS_TARGET, 	//bool
+FEATURES_COPY_MODE_SANITIZE_DTS, 	//bool
 KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS, 	//bool
 KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS, 	//bool
 KEYBOARD_SHORTCUTS_ALT_MARK_A, 	//string
@@ -53,7 +54,6 @@
 DEFAULT_DOWNMIXING, 	//uint32_t
 DEFAULT_LANGUAGE, 	//string
 DEFAULT_WARN_FOR_FONTS, 	//bool
-MPEGSPLIT_AUTOSPLIT, 	//uint32_t
 AVISYNTH_AVISYNTH_ALWAYS_ASK, 	//bool
 AVISYNTH_AVISYNTH_DEFAULTPORT, 	//uint32_t
 AVISYNTH_AVISYNTH_LOCALPORT, 	//uint32_t

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp Changed

@@ -14,193 +14,193 @@
 
 
 static const iso639_lang_t languages[] =
-{ { QT_TRANSLATE_NOOP("adm","Unknown"), "", "", "und" },
- { "Afar", "", "aa", "aar" },
- { "Abkhazian", "", "ab", "abk" },
- { "Afrikaans", "", "af", "afr" },
- { "Akan", "", "ak", "aka" },
+{ { QT_TRANSLATE_NOOP("adm","Unknown"), "", "", "und", NULL },
+ { "Afar", "", "aa", "aar", NULL },
+ { "Abkhazian", "", "ab", "abk", NULL },
+ { "Afrikaans", "", "af", "afr", NULL },
+ { "Akan", "", "ak", "aka", NULL },
 { "Albanian", "", "sq", "sqi", "alb" },
- { "Amharic", "", "am", "amh" },
- { "Arabic", "", "ar", "ara" },
- { "Aragonese", "", "an", "arg" },
+ { "Amharic", "", "am", "amh", NULL },
+ { "Arabic", "", "ar", "ara", NULL },
+ { "Aragonese", "", "an", "arg", NULL },
 { "Armenian", "", "hy", "hye", "arm" },
- { "Assamese", "", "as", "asm" },
- { "Avaric", "", "av", "ava" },
- { "Avestan", "", "ae", "ave" },
- { "Aymara", "", "ay", "aym" },
- { "Azerbaijani", "", "az", "aze" },
- { "Bashkir", "", "ba", "bak" },
- { "Bambara", "", "bm", "bam" },
+ { "Assamese", "", "as", "asm", NULL },
+ { "Avaric", "", "av", "ava", NULL },
+ { "Avestan", "", "ae", "ave", NULL },
+ { "Aymara", "", "ay", "aym", NULL },
+ { "Azerbaijani", "", "az", "aze", NULL },
+ { "Bashkir", "", "ba", "bak", NULL },
+ { "Bambara", "", "bm", "bam", NULL },
 { "Basque", "", "eu", "eus", "baq" },
- { "Belarusian", "", "be", "bel" },
- { "Bengali", "", "bn", "ben" },
- { "Bihari", "", "bh", "bih" },
- { "Bislama", "", "bi", "bis" },
- { "Bosnian", "", "bs", "bos" },
- { "Breton", "", "br", "bre" },
- { "Bulgarian", "", "bg", "bul" },
+ { "Belarusian", "", "be", "bel", NULL },
+ { "Bengali", "", "bn", "ben", NULL },
+ { "Bihari", "", "bh", "bih", NULL },
+ { "Bislama", "", "bi", "bis", NULL },
+ { "Bosnian", "", "bs", "bos", NULL },
+ { "Breton", "", "br", "bre", NULL },
+ { "Bulgarian", "", "bg", "bul", NULL },
 { "Burmese", "", "my", "mya", "bur" },
- { "Catalan", "", "ca", "cat" },
- { "Chamorro", "", "ch", "cha" },
- { "Chechen", "", "ce", "che" },
+ { "Catalan", "", "ca", "cat", NULL },
+ { "Chamorro", "", "ch", "cha", NULL },
+ { "Chechen", "", "ce", "che", NULL },
 { "Chinese", "", "zh", "zho", "chi" },
- { "Church Slavic", "", "cu", "chu" },
- { "Chuvash", "", "cv", "chv" },
- { "Cornish", "", "kw", "cor" },
- { "Corsican", "", "co", "cos" },
- { "Cree", "", "cr", "cre" },
+ { "Church Slavic", "", "cu", "chu", NULL },
+ { "Chuvash", "", "cv", "chv", NULL },
+ { "Cornish", "", "kw", "cor", NULL },
+ { "Corsican", "", "co", "cos", NULL },
+ { "Cree", "", "cr", "cre", NULL },
 { "Czech", "", "cs", "ces", "cze" },
- { "Danish", "Dansk", "da", "dan" },
- { "Divehi", "", "dv", "div" },
+ { "Danish", "Dansk", "da", "dan", NULL },
+ { "Divehi", "", "dv", "div", NULL },
 { "Dutch", "Nederlands", "nl", "nld", "dut" },
- { "Dzongkha", "", "dz", "dzo" },
- { "English", "English", "en", "eng" },
- { "Esperanto", "", "eo", "epo" },
- { "Estonian", "", "et", "est" },
- { "Ewe", "", "ee", "ewe" },
- { "Faroese", "", "fo", "fao" },
- { "Fijian", "", "fj", "fij" },
- { "Finnish", "Suomi", "fi", "fin" },
+ { "Dzongkha", "", "dz", "dzo", NULL },
+ { "English", "English", "en", "eng", NULL },
+ { "Esperanto", "", "eo", "epo", NULL },
+ { "Estonian", "", "et", "est", NULL },
+ { "Ewe", "", "ee", "ewe", NULL },
+ { "Faroese", "", "fo", "fao", NULL },
+ { "Fijian", "", "fj", "fij", NULL },
+ { "Finnish", "Suomi", "fi", "fin", NULL },
 { "French", "Francais", "fr", "fra", "fre" },
- { "Western Frisian", "", "fy", "fry" },
- { "Fulah", "", "ff", "ful" },
+ { "Western Frisian", "", "fy", "fry", NULL },
+ { "Fulah", "", "ff", "ful", NULL },
 { "Georgian", "", "ka", "kat", "geo" },
 { "German", "Deutsch", "de", "deu", "ger" },
- { "Gaelic (Scots)", "", "gd", "gla" },
- { "Irish", "", "ga", "gle" },
- { "Galician", "", "gl", "glg" },
- { "Manx", "", "gv", "glv" },
+ { "Gaelic (Scots)", "", "gd", "gla", NULL },
+ { "Irish", "", "ga", "gle", NULL },
+ { "Galician", "", "gl", "glg", NULL },
+ { "Manx", "", "gv", "glv", NULL },
 { "Greek, Modern", "", "el", "ell", "gre" },
- { "Guarani", "", "gn", "grn" },
- { "Gujarati", "", "gu", "guj" },
- { "Haitian", "", "ht", "hat" },
- { "Hausa", "", "ha", "hau" },
- { "Hebrew", "", "he", "heb" },
- { "Herero", "", "hz", "her" },
- { "Hindi", "", "hi", "hin" },
- { "Hiri Motu", "", "ho", "hmo" },
+ { "Guarani", "", "gn", "grn", NULL },
+ { "Gujarati", "", "gu", "guj", NULL },
+ { "Haitian", "", "ht", "hat", NULL },
+ { "Hausa", "", "ha", "hau", NULL },
+ { "Hebrew", "", "he", "heb", NULL },
+ { "Herero", "", "hz", "her", NULL },
+ { "Hindi", "", "hi", "hin", NULL },
+ { "Hiri Motu", "", "ho", "hmo", NULL },
 { "Hungarian", "Magyar", "hu", "hun" },
- { "Igbo", "", "ig", "ibo" },
+ { "Igbo", "", "ig", "ibo", NULL },
 { "Icelandic", "Islenska", "is", "isl", "ice" },
- { "Ido", "", "io", "ido" },
- { "Sichuan Yi", "", "ii", "iii" },
- { "Inuktitut", "", "iu", "iku" },
- { "Interlingue", "", "ie", "ile" },
- { "Interlingua", "", "ia", "ina" },
- { "Indonesian", "", "id", "ind" },
- { "Inupiaq", "", "ik", "ipk" },
- { "Italian", "Italiano", "it", "ita" },
- { "Javanese", "", "jv", "jav" },
- { "Japanese", "", "ja", "jpn" },
- { "Kalaallisut (Greenlandic)", "", "kl", "kal" },
- { "Kannada", "", "kn", "kan" },
- { "Kashmiri", "", "ks", "kas" },
- { "Kanuri", "", "kr", "kau" },
- { "Kazakh", "", "kk", "kaz" },
- { "Central Khmer", "", "km", "khm" },
- { "Kikuyu", "", "ki", "kik" },
- { "Kinyarwanda", "", "rw", "kin" },
- { "Kirghiz", "", "ky", "kir" },
- { "Komi", "", "kv", "kom" },
- { "Kongo", "", "kg", "kon" },
- { "Korean", "", "ko", "kor" },
- { "Kuanyama", "", "kj", "kua" },
- { "Kurdish", "", "ku", "kur" },
- { "Lao", "", "lo", "lao" },
- { "Latin", "", "la", "lat" },
- { "Latvian", "", "lv", "lav" },
- { "Limburgan", "", "li", "lim" },
- { "Lingala", "", "ln", "lin" },
- { "Lithuanian", "", "lt", "lit" },
- { "Luxembourgish", "", "lb", "ltz" },
- { "Luba-Katanga", "", "lu", "lub" },
- { "Ganda", "", "lg", "lug" },
+ { "Ido", "", "io", "ido", NULL },
+ { "Sichuan Yi", "", "ii", "iii", NULL },
+ { "Inuktitut", "", "iu", "iku", NULL },
+ { "Interlingue", "", "ie", "ile", NULL },
+ { "Interlingua", "", "ia", "ina", NULL },
+ { "Indonesian", "", "id", "ind", NULL },
+ { "Inupiaq", "", "ik", "ipk", NULL },
+ { "Italian", "Italiano", "it", "ita", NULL },
+ { "Javanese", "", "jv", "jav", NULL },
+ { "Japanese", "", "ja", "jpn", NULL },
+ { "Kalaallisut (Greenlandic)", "", "kl", "kal", NULL },
+ { "Kannada", "", "kn", "kan", NULL },
+ { "Kashmiri", "", "ks", "kas", NULL },
+ { "Kanuri", "", "kr", "kau", NULL },
+ { "Kazakh", "", "kk", "kaz", NULL },
+ { "Central Khmer", "", "km", "khm", NULL },
+ { "Kikuyu", "", "ki", "kik", NULL },
+ { "Kinyarwanda", "", "rw", "kin", NULL },
+ { "Kirghiz", "", "ky", "kir", NULL },
+ { "Komi", "", "kv", "kom", NULL },
+ { "Kongo", "", "kg", "kon", NULL },
+ { "Korean", "", "ko", "kor", NULL },
+ { "Kuanyama", "", "kj", "kua", NULL },
+ { "Kurdish", "", "ku", "kur", NULL },
+ { "Lao", "", "lo", "lao", NULL },
+ { "Latin", "", "la", "lat", NULL },
+ { "Latvian", "", "lv", "lav", NULL },
+ { "Limburgan", "", "li", "lim", NULL },
+ { "Lingala", "", "ln", "lin", NULL },
+ { "Lithuanian", "", "lt", "lit", NULL },
+ { "Luxembourgish", "", "lb", "ltz", NULL },
+ { "Luba-Katanga", "", "lu", "lub", NULL },
+ { "Ganda", "", "lg", "lug", NULL },
 { "Macedonian", "", "mk", "mkd", "mac" },
- { "Marshallese", "", "mh", "mah" },
- { "Malayalam", "", "ml", "mal" },
+ { "Marshallese", "", "mh", "mah", NULL },
+ { "Malayalam", "", "ml", "mal", NULL },
 { "Maori", "", "mi", "mri", "mao" },
- { "Marathi", "", "mr", "mar" },
- { "Malay", "", "ms", "msa", "msa" },
- { "Malagasy", "", "mg", "mlg" },
- { "Maltese", "", "mt", "mlt" },
- { "Moldavian", "", "mo", "mol" },
- { "Mongolian", "", "mn", "mon" },
- { "Nauru", "", "na", "nau" },
- { "Navajo", "", "nv", "nav" },
- { "Ndebele, South", "", "nr", "nbl" },
- { "Ndebele, North", "", "nd", "nde" },
- { "Ndonga", "", "ng", "ndo" },
- { "Nepali", "", "ne", "nep" },
- { "Norwegian Nynorsk", "", "nn", "nno" },
- { "Norwegian Bokmål", "", "nb", "nob" },
- { "Norwegian", "Norsk", "no", "nor" },
- { "Chichewa; Nyanja", "", "ny", "nya" },
- { "Occitan (post 1500); Provençal", "", "oc", "oci" },
- { "Ojibwa", "", "oj", "oji" },
- { "Oriya", "", "or", "ori" },
- { "Oromo", "", "om", "orm" },
- { "Ossetian; Ossetic", "", "os", "oss" },
- { "Panjabi", "", "pa", "pan" },
+ { "Marathi", "", "mr", "mar", NULL },
+ { "Malay", "", "ms", "msa", "may" },
+ { "Malagasy", "", "mg", "mlg", NULL },
+ { "Maltese", "", "mt", "mlt", NULL },
+ { "Moldavian", "", "mo", "mol", NULL },
+ { "Mongolian", "", "mn", "mon", NULL },
+ { "Nauru", "", "na", "nau", NULL },
+ { "Navajo", "", "nv", "nav", NULL },
+ { "Ndebele, South", "", "nr", "nbl", NULL },
+ { "Ndebele, North", "", "nd", "nde", NULL },
+ { "Ndonga", "", "ng", "ndo", NULL },
+ { "Nepali", "", "ne", "nep", NULL },
+ { "Norwegian Nynorsk", "", "nn", "nno", NULL },
+ { "Norwegian Bokmål", "", "nb", "nob", NULL },
+ { "Norwegian", "Norsk", "no", "nor", NULL },
+ { "Chichewa; Nyanja", "", "ny", "nya", NULL },
+ { "Occitan (post 1500); Provençal", "", "oc", "oci", NULL },
+ { "Ojibwa", "", "oj", "oji", NULL },
+ { "Oriya", "", "or", "ori", NULL },
+ { "Oromo", "", "om", "orm", NULL },
+ { "Ossetian; Ossetic", "", "os", "oss", NULL },
+ { "Panjabi", "", "pa", "pan", NULL },
 { "Persian", "", "fa", "fas", "per" },
- { "Pali", "", "pi", "pli" },
- { "Polish", "", "pl", "pol" },
- { "Portuguese", "Portugues", "pt", "por" },
- { "Pushto", "", "ps", "pus" },
- { "Quechua", "", "qu", "que" },
- { "Romansh", "", "rm", "roh" },
+ { "Pali", "", "pi", "pli", NULL },
+ { "Polish", "", "pl", "pol", NULL },
+ { "Portuguese", "Portugues", "pt", "por", NULL },
+ { "Pushto", "", "ps", "pus", NULL },
+ { "Quechua", "", "qu", "que", NULL },
+ { "Romansh", "", "rm", "roh", NULL },
 { "Romanian", "", "ro", "ron", "rum" },
- { "Rundi", "", "rn", "run" },
- { "Russian", "", "ru", "rus" },
- { "Sango", "", "sg", "sag" },
- { "Sanskrit", "", "sa", "san" },
+ { "Rundi", "", "rn", "run", NULL },
+ { "Russian", "", "ru", "rus", NULL },
+ { "Sango", "", "sg", "sag", NULL },
+ { "Sanskrit", "", "sa", "san", NULL },
 { "Serbian", "", "sr", "srp", "scc" },
 { "Croatian", "Hrvatski", "hr", "hrv", "scr" },
- { "Sinhala", "", "si", "sin" },
+ { "Sinhala", "", "si", "sin", NULL },
 { "Slovak", "", "sk", "slk", "slo" },
- { "Slovenian", "", "sl", "slv" },
- { "Northern Sami", "", "se", "sme" },
- { "Samoan", "", "sm", "smo" },
- { "Shona", "", "sn", "sna" },
- { "Sindhi", "", "sd", "snd" },
- { "Somali", "", "so", "som" },
- { "Sotho, Southern", "", "st", "sot" },
- { "Spanish", "Espanol", "es", "spa" },
- { "Sardinian", "", "sc", "srd" },
- { "Swati", "", "ss", "ssw" },
- { "Sundanese", "", "su", "sun" },
- { "Swahili", "", "sw", "swa" },
- { "Swedish", "Svenska", "sv", "swe" },
- { "Tahitian", "", "ty", "tah" },
- { "Tamil", "", "ta", "tam" },
- { "Tatar", "", "tt", "tat" },
- { "Telugu", "", "te", "tel" },
- { "Tajik", "", "tg", "tgk" },
- { "Tagalog", "", "tl", "tgl" },
- { "Thai", "", "th", "tha" },
+ { "Slovenian", "", "sl", "slv", NULL },
+ { "Northern Sami", "", "se", "sme", NULL },
+ { "Samoan", "", "sm", "smo", NULL },
+ { "Shona", "", "sn", "sna", NULL },
+ { "Sindhi", "", "sd", "snd", NULL },
+ { "Somali", "", "so", "som", NULL },
+ { "Sotho, Southern", "", "st", "sot", NULL },
+ { "Spanish", "Espanol", "es", "spa", NULL },
+ { "Sardinian", "", "sc", "srd", NULL },
+ { "Swati", "", "ss", "ssw", NULL },
+ { "Sundanese", "", "su", "sun", NULL },
+ { "Swahili", "", "sw", "swa", NULL },
+ { "Swedish", "Svenska", "sv", "swe", NULL },
+ { "Tahitian", "", "ty", "tah", NULL },
+ { "Tamil", "", "ta", "tam", NULL },
+ { "Tatar", "", "tt", "tat", NULL },
+ { "Telugu", "", "te", "tel", NULL },
+ { "Tajik", "", "tg", "tgk", NULL },
+ { "Tagalog", "", "tl", "tgl", NULL },
+ { "Thai", "", "th", "tha", NULL },
 { "Tibetan", "", "bo", "bod", "tib" },
- { "Tigrinya", "", "ti", "tir" },
- { "Tonga (Tonga Islands)", "", "to", "ton" },
- { "Tswana", "", "tn", "tsn" },
- { "Tsonga", "", "ts", "tso" },
- { "Turkmen", "", "tk", "tuk" },
- { "Turkish", "", "tr", "tur" },
- { "Twi", "", "tw", "twi" },
- { "Uighur", "", "ug", "uig" },
- { "Ukrainian", "", "uk", "ukr" },
- { "Urdu", "", "ur", "urd" },
- { "Uzbek", "", "uz", "uzb" },
- { "Venda", "", "ve", "ven" },
- { "Vietnamese", "", "vi", "vie" },
- { "Volapük", "", "vo", "vol" },
+ { "Tigrinya", "", "ti", "tir", NULL },
+ { "Tonga (Tonga Islands)", "", "to", "ton", NULL },
+ { "Tswana", "", "tn", "tsn", NULL },
+ { "Tsonga", "", "ts", "tso", NULL },
+ { "Turkmen", "", "tk", "tuk", NULL },
+ { "Turkish", "", "tr", "tur", NULL },
+ { "Twi", "", "tw", "twi", NULL },
+ { "Uighur", "", "ug", "uig", NULL },
+ { "Ukrainian", "", "uk", "ukr", NULL },
+ { "Urdu", "", "ur", "urd", NULL },
+ { "Uzbek", "", "uz", "uzb", NULL },
+ { "Venda", "", "ve", "ven", NULL },
+ { "Vietnamese", "", "vi", "vie", NULL },
+ { "Volapük", "", "vo", "vol", NULL },
 { "Welsh", "", "cy", "cym", "wel" },
- { "Walloon", "", "wa", "wln" },
- { "Wolof", "", "wo", "wol" },
- { "Xhosa", "", "xh", "xho" },
- { "Yiddish", "", "yi", "yid" },
- { "Yoruba", "", "yo", "yor" },
- { "Zhuang", "", "za", "zha" },
- { "Zulu", "", "zu", "zul" },
- { NULL, NULL, NULL } };
+ { "Walloon", "", "wa", "wln", NULL },
+ { "Wolof", "", "wo", "wol", NULL },
+ { "Xhosa", "", "xh", "xho", NULL },
+ { "Yiddish", "", "yi", "yid", NULL },
+ { "Yoruba", "", "yo", "yor", NULL },
+ { "Zhuang", "", "za", "zha", NULL },
+ { "Zulu", "", "zu", "zul", NULL },
+ { NULL, NULL, NULL, NULL, NULL } };
 /**
 * \fn ADM_getLanguageList
 * @return 
@@ -236,11 +236,14 @@
 const char *ADM_iso639b_toPlaintext(const char *iso)
 {
 iso639_lang_t *lang;
- for( lang = (iso639_lang_t*) languages; lang->eng_name; lang++ )
- {
- if(!strcmp(lang->iso639_2,iso)) return lang->eng_name;
- }
- return iso;
+ for( lang = (iso639_lang_t*) languages; lang->eng_name; lang++ )
+ {
+ if(!strcmp(lang->iso639_2,iso))
+ return lang->eng_name;
+ if(lang->iso639_2b && !strcmp(lang->iso639_2b,iso))
+ return lang->eng_name;
+ }
+ return iso;
 }
 /**
 * \fn ADM_getIndexForIso639
@@ -253,6 +256,7 @@
 for(int i=0;i<n;i++)
 {
 if(!strcmp(languages[i].iso639_2,iso)) return i;
+ if(languages[i].iso639_2b && !strcmp(languages[i].iso639_2b,iso)) return i;
 }
 ADM_error("Language %s not found in list\n",iso);
 return -1;

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf Changed

@@ -20,7 +20,6 @@
 bool:swap_if_A_greater_than_B,	       1,      0,      1
 bool:saveprefsonexit,		       1,      0,	    1
 bool:ignoresavedmarkers,	       0,      0,	    1
-bool:use_odml,                         0,      0,      1
 bool:reuse_2pass_log,                  0,      0,      1
 bool:audiobar_uses_master,             0,      0,      1
 uint32_t:threading_lavc,               0,      0,      32
@@ -31,11 +30,13 @@
 bool:vdpau,                            0,      0,      1
 bool:xvba,                             0,      0,      1
 bool:libva,                            0,      0,      1
+bool:videotoolbox,                     0,      0,      1
 bool:enable_opengl,                    0,      0,      1
 bool:cap_refresh_enabled,              0,      0,      1
 uint32_t:cap_refresh_value,            100,    10,     1000
 string:sdlDriver,                      ""
 bool:use_last_read_dir_as_target,      0,      0,      1
+bool:copy_mode_sanitize_dts,           0,      0,      1
 }
 #
 keyboard_shortcuts{
@@ -90,13 +91,11 @@
 Default{
 uint32_t:postproc_type,			3,	0,	7
 uint32_t:postproc_value,		3,	0,	5
-uint32_t:downmixing,		        2,	0,	2
+uint32_t:downmixing,		        2,	0,	3
 string:language,                        ""
 bool:warn_for_fonts,                    1,      0,      1
 }
 #
-uint32_t:mpegsplit_autosplit, 		790,	400,	5000
-#
 avisynth{
 bool:avisynth_always_ask,                  0,      0,      1
 uint32_t:avisynth_defaultport,	        9999,      1024, 65535

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp Changed

@@ -4,7 +4,6 @@
  {"features.swap_if_A_greater_than_B",offsetof(my_prefs_struct,features.swap_if_A_greater_than_B),"bool",ADM_param_bool},
  {"features.saveprefsonexit",offsetof(my_prefs_struct,features.saveprefsonexit),"bool",ADM_param_bool},
  {"features.ignoresavedmarkers",offsetof(my_prefs_struct,features.ignoresavedmarkers),"bool",ADM_param_bool},
- {"features.use_odml",offsetof(my_prefs_struct,features.use_odml),"bool",ADM_param_bool},
  {"features.reuse_2pass_log",offsetof(my_prefs_struct,features.reuse_2pass_log),"bool",ADM_param_bool},
  {"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},
@@ -15,11 +14,13 @@
  {"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},
+ {"features.videotoolbox",offsetof(my_prefs_struct,features.videotoolbox),"bool",ADM_param_bool},
  {"features.enable_opengl",offsetof(my_prefs_struct,features.enable_opengl),"bool",ADM_param_bool},
  {"features.cap_refresh_enabled",offsetof(my_prefs_struct,features.cap_refresh_enabled),"bool",ADM_param_bool},
  {"features.cap_refresh_value",offsetof(my_prefs_struct,features.cap_refresh_value),"uint32_t",ADM_param_uint32_t},
  {"features.sdlDriver",offsetof(my_prefs_struct,features.sdlDriver),"std::string",ADM_param_stdstring},
  {"features.use_last_read_dir_as_target",offsetof(my_prefs_struct,features.use_last_read_dir_as_target),"bool",ADM_param_bool},
+ {"features.copy_mode_sanitize_dts",offsetof(my_prefs_struct,features.copy_mode_sanitize_dts),"bool",ADM_param_bool},
  {"keyboard_shortcuts.use_alternate_kbd_shortcuts",offsetof(my_prefs_struct,keyboard_shortcuts.use_alternate_kbd_shortcuts),"bool",ADM_param_bool},
  {"keyboard_shortcuts.swap_up_down_keys",offsetof(my_prefs_struct,keyboard_shortcuts.swap_up_down_keys),"bool",ADM_param_bool},
  {"keyboard_shortcuts.alt_mark_a",offsetof(my_prefs_struct,keyboard_shortcuts.alt_mark_a),"std::string",ADM_param_stdstring},
@@ -55,7 +56,6 @@
  {"Default.downmixing",offsetof(my_prefs_struct,Default.downmixing),"uint32_t",ADM_param_uint32_t},
  {"Default.language",offsetof(my_prefs_struct,Default.language),"std::string",ADM_param_stdstring},
  {"Default.warn_for_fonts",offsetof(my_prefs_struct,Default.warn_for_fonts),"bool",ADM_param_bool},
- {"mpegsplit_autosplit",offsetof(my_prefs_struct,mpegsplit_autosplit),"uint32_t",ADM_param_uint32_t},
  {"avisynth.avisynth_always_ask",offsetof(my_prefs_struct,avisynth.avisynth_always_ask),"bool",ADM_param_bool},
  {"avisynth.avisynth_defaultport",offsetof(my_prefs_struct,avisynth.avisynth_defaultport),"uint32_t",ADM_param_uint32_t},
  {"avisynth.avisynth_localport",offsetof(my_prefs_struct,avisynth.avisynth_localport),"uint32_t",ADM_param_uint32_t},

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp Changed

@@ -12,7 +12,6 @@
 json.addBool("swap_if_A_greater_than_B",key->features.swap_if_A_greater_than_B);
 json.addBool("saveprefsonexit",key->features.saveprefsonexit);
 json.addBool("ignoresavedmarkers",key->features.ignoresavedmarkers);
-json.addBool("use_odml",key->features.use_odml);
 json.addBool("reuse_2pass_log",key->features.reuse_2pass_log);
 json.addBool("audiobar_uses_master",key->features.audiobar_uses_master);
 json.addUint32("threading_lavc",key->features.threading_lavc);
@@ -23,11 +22,13 @@
 json.addBool("vdpau",key->features.vdpau);
 json.addBool("xvba",key->features.xvba);
 json.addBool("libva",key->features.libva);
+json.addBool("videotoolbox",key->features.videotoolbox);
 json.addBool("enable_opengl",key->features.enable_opengl);
 json.addBool("cap_refresh_enabled",key->features.cap_refresh_enabled);
 json.addUint32("cap_refresh_value",key->features.cap_refresh_value);
 json.addString("sdlDriver",key->features.sdlDriver);
 json.addBool("use_last_read_dir_as_target",key->features.use_last_read_dir_as_target);
+json.addBool("copy_mode_sanitize_dts",key->features.copy_mode_sanitize_dts);
 json.endNode();
 json.addNode("keyboard_shortcuts");
 json.addBool("use_alternate_kbd_shortcuts",key->keyboard_shortcuts.use_alternate_kbd_shortcuts);
@@ -78,7 +79,6 @@
 json.addString("language",key->Default.language);
 json.addBool("warn_for_fonts",key->Default.warn_for_fonts);
 json.endNode();
-json.addUint32("mpegsplit_autosplit",key->mpegsplit_autosplit);
 json.addNode("avisynth");
 json.addBool("avisynth_always_ask",key->avisynth.avisynth_always_ask);
 json.addUint32("avisynth_defaultport",key->avisynth.avisynth_defaultport);

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h Changed

@@ -15,7 +15,6 @@
 { FEATURES_SWAP_IF_A_GREATER_THAN_B,"features.swap_if_A_greater_than_B",ADM_param_bool    	,"1",	0,	1},
 { FEATURES_SAVEPREFSONEXIT,"features.saveprefsonexit"                 ,ADM_param_bool    	,"1",	0,	1},
 { FEATURES_IGNORESAVEDMARKERS,"features.ignoresavedmarkers"           ,ADM_param_bool    	,"0",	0,	1},
-{ FEATURES_USE_ODML,"features.use_odml"                               ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_REUSE_2PASS_LOG,"features.reuse_2pass_log"                 ,ADM_param_bool    	,"0",	0,	1},
 { 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},
@@ -26,11 +25,13 @@
 { 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},
+{ FEATURES_VIDEOTOOLBOX,"features.videotoolbox"                       ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_ENABLE_OPENGL,"features.enable_opengl"                     ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_CAP_REFRESH_ENABLED,"features.cap_refresh_enabled"         ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_CAP_REFRESH_VALUE,"features.cap_refresh_value"             ,ADM_param_uint32_t	,"100",	10,	1000},
 { FEATURES_SDLDRIVER,"features.sdlDriver"                             ,ADM_param_stdstring  	,"",	0,	0},
 { FEATURES_USE_LAST_READ_DIR_AS_TARGET,"features.use_last_read_dir_as_target",ADM_param_bool    	,"0",	0,	1},
+{ FEATURES_COPY_MODE_SANITIZE_DTS,"features.copy_mode_sanitize_dts"   ,ADM_param_bool    	,"0",	0,	1},
 { KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,"keyboard_shortcuts.use_alternate_kbd_shortcuts",ADM_param_bool    	,"0",	0,	1},
 { KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS,"keyboard_shortcuts.swap_up_down_keys",ADM_param_bool    	,"0",	0,	1},
 { KEYBOARD_SHORTCUTS_ALT_MARK_A,"keyboard_shortcuts.alt_mark_a"       ,ADM_param_stdstring  	,"I",	0,	0},
@@ -63,10 +64,9 @@
 { PRIORITY_PLAYBACK,"priority.playback"                               ,ADM_param_uint32_t	,"0",	0,	4},
 { DEFAULT_POSTPROC_TYPE,"Default.postproc_type"                       ,ADM_param_uint32_t	,"3",	0,	7},
 { DEFAULT_POSTPROC_VALUE,"Default.postproc_value"                     ,ADM_param_uint32_t	,"3",	0,	5},
-{ DEFAULT_DOWNMIXING,"Default.downmixing"                             ,ADM_param_uint32_t	,"2",	0,	2},
+{ DEFAULT_DOWNMIXING,"Default.downmixing"                             ,ADM_param_uint32_t	,"2",	0,	3},
 { DEFAULT_LANGUAGE,"Default.language"                                 ,ADM_param_stdstring  	,"",	0,	0},
 { DEFAULT_WARN_FOR_FONTS,"Default.warn_for_fonts"                     ,ADM_param_bool    	,"1",	0,	1},
-{ MPEGSPLIT_AUTOSPLIT,"mpegsplit_autosplit"                           ,ADM_param_uint32_t	,"790",	400,	5000},
 { AVISYNTH_AVISYNTH_ALWAYS_ASK,"avisynth.avisynth_always_ask"         ,ADM_param_bool    	,"0",	0,	1},
 { AVISYNTH_AVISYNTH_DEFAULTPORT,"avisynth.avisynth_defaultport"       ,ADM_param_uint32_t	,"9999",	1024,	65535},
 { AVISYNTH_AVISYNTH_LOCALPORT,"avisynth.avisynth_localport"           ,ADM_param_uint32_t	,"0",	1024,	65535},

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h Changed

@@ -110,26 +110,6 @@
  * \class admLibVAEnc
  */
 class ADMBitstream;
-class ADM_vaEncodingBuffer;
-class ADM_vaEncodingContext
-{
-friend class ADM_vaEncodingBuffer;
-protected:   
-        int             width16;
-        int             height16;
-        VAContextID     contextId;
-        ADM_vaSurface   *internalSurface[2];
-        uint8_t         *extraData;
-        int              extraDataSize;
-        bool             firstPic;
-        int              toggle;
-public:
-                    ADM_vaEncodingContext();
-        bool        init(int width, int height, int surfaceCount, ADM_vaSurface **surfaces); 
-        bool        createExtraData();
-                    ~ADM_vaEncodingContext();
-        bool        encode(ADM_vaSurface *src, ADMBitstream *out,ADM_vaEncodingBuffer *encodingBuffer);
-};
 /**
  * \class ADM_vaSurface
  */
@@ -152,17 +132,5 @@
     static ADM_vaSurface *allocateWithSurface(int w,int h,int fmt=VA_RT_FORMAT_YUV420);
     
 };
-/**
- * \class ADM_vaEncodingBuffer
- */
-
-class ADM_vaEncodingBuffer
-{
-public:
-    VABufferID          bufferId;
-    ADM_vaEncodingBuffer(ADM_vaEncodingContext *context,int bufferSize);
-    ~ADM_vaEncodingBuffer();
-    bool   readBuffers(int maxSize, uint8_t *to, uint32_t *sizeOut);
-};
 #endif
 #endif

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

@@ -275,12 +275,21 @@
     *cid=-1;
     VAConfigAttrib attrib;
     attrib.type = VAConfigAttribRTFormat;
+    ADM_info("--Probing %s ...\n",name);
     CHECK_ERROR(vaGetConfigAttributes(ADM_coreLibVA::display, profile, VAEntrypointVLD, &attrib, 1));
     if(xError)
     {
-         ADM_warning("Cannot get attribute for %s \n",name);
+         ADM_warning("Cannot get attribute  for VAEntrypointVLD %s \n",name);
          return false;
     }
+    ADM_info("RT Format =0x%x\n",attrib.value);
+#define CHECK_RT(x)    if(attrib.value & VA_RT_FORMAT_##x ) ADM_info("\t" #x " supported\n");
+    CHECK_RT(YUV420);
+    CHECK_RT(YUV422);
+    CHECK_RT(YUV444);
+    CHECK_RT(YUV420_10BPP);
+    CHECK_RT(RGB32);
+    
     CHECK_ERROR(vaCreateConfig( ADM_coreLibVA::display, profile, VAEntrypointVLD,&attrib, 1,cid));
     if(xError)
     {
@@ -454,6 +463,11 @@
     ADM_coreLibVA::decoders::h264=false;
     ADM_coreLibVA::directOperation=true;
     ADM_coreLibVA::transferMode=ADM_LIBVA_NONE;
+    
+    ADM_coreLibVA::configH265=-1;
+    ADM_coreLibVA::configH26510Bits=-1;
+    ADM_coreLibVA::configVP9=-1;
+    
 
     myWindowInfo=*x;
     VAStatus xError;
@@ -565,7 +579,11 @@
                 break;
 
     }
-
+    if(cid==-1)
+    {
+        ADM_warning("No VA support for that\n");
+        return VA_INVALID;
+    }
     CHECK_ERROR(vaCreateContext ( ADM_coreLibVA::display, cid,
                 width,    height,
                 VA_PROGRESSIVE, // ?? NOT SURE ??
@@ -1361,5 +1379,4 @@
 }
 
 
-#include "ADM_coreLibVA_encoder.cpp"
 #endif

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/CMakeLists.txt Changed

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/CMakeLists.txt Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/include Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/include/ADM_coreVideoToolbox.h Added

@@ -0,0 +1,32 @@
+/***************************************************************************
+    \file             : ADM_coreVideoToolbox.h
+    \brief            : Wrapper around VideoToolbox functions
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef ADM_CORE_VIDEOTOOLBOX_H
+#define ADM_CORE_VIDEOTOOLBOX_H
+
+#include "ADM_windowInfo.h"
+
+class admCoreVideoToolbox
+{
+public:
+    static bool         init(GUI_WindowInfo *x) { return true; }
+    static bool         isOperationnal(void) { return true; }
+    static bool         cleanup(void) {return true; }
+
+    static int          initVideoToolbox(AVCodecContext *avctx);
+    static int          copyData(AVCodecContext *avctx, AVFrame *src, ADMImage *dest);
+    static void         uninit(AVCodecContext *avctx);
+};
+
+#endif
\ No newline at end of file

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/src Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/src/ADM_coreVideoToolbox.cpp Added

@@ -0,0 +1,110 @@
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include <CoreServices/CoreServices.h>
+
+extern "C" {
+#include "libavcodec/avcodec.h"
+#include "libavcodec/videotoolbox.h"
+#include "libavutil/frame.h"
+#include "libavutil/pixdesc.h"
+}
+
+#include "../include/ADM_coreVideoToolbox.h"
+
+static AVVideotoolboxContext *vtctx;
+
+int admCoreVideoToolbox::copyData(AVCodecContext *s, AVFrame *src, ADMImage *dest)
+{
+ CVPixelBufferRef pixbuf = (CVPixelBufferRef)src->data[3];
+ OSType pixel_format = CVPixelBufferGetPixelFormatType(pixbuf);
+ CVReturn err;
+ uint8_t *data[4] = { 0 };
+ int linesize[4] = { 0 };
+ int planes, i;
+
+ switch (pixel_format)
+ {
+ case kCVPixelFormatType_420YpCbCr8Planar:
+ dest->_colorspace = ADM_COLOR_YV12; // we handle only YUV420P for now
+ //ADM_info("pixel format: YUV420P (%d)\n",pixel_format);
+ break;
+ default:
+ ADM_error("%s: Unsupported pixel format: %d\n", av_fourcc2str(s->codec_tag), pixel_format);
+ return AVERROR(ENOSYS);
+ }
+
+ dest->_width = CVPixelBufferGetWidth(pixbuf);
+ dest->_height = CVPixelBufferGetHeight(pixbuf);
+
+ err = CVPixelBufferLockBaseAddress(pixbuf, kCVPixelBufferLock_ReadOnly);
+ if (err != kCVReturnSuccess)
+ {
+ ADM_error("Error locking the pixbuf base address.\n");
+ return AVERROR_UNKNOWN;
+ }
+
+ if (CVPixelBufferIsPlanar(pixbuf))
+ {
+ planes = CVPixelBufferGetPlaneCount(pixbuf);
+ for (i = 0; i < planes; i++)
+ {
+ data[i] = (uint8_t *)CVPixelBufferGetBaseAddressOfPlane(pixbuf, i);
+ linesize[i] = CVPixelBufferGetBytesPerRowOfPlane(pixbuf, i);
+ }
+ } else
+ {
+ data[0] = (uint8_t *)CVPixelBufferGetBaseAddress(pixbuf);
+ linesize[0] = CVPixelBufferGetBytesPerRow(pixbuf);
+ }
+
+ dest->_planes[0] = data[0];
+ dest->_planes[1] = data[2];
+ dest->_planes[2] = data[1];
+ dest->_planeStride[0] = linesize[0];
+ dest->_planeStride[1] = linesize[2];
+ dest->_planeStride[2] = linesize[1];
+
+ CVPixelBufferUnlockBaseAddress(pixbuf, kCVPixelBufferLock_ReadOnly);
+
+ return 0;
+}
+
+void admCoreVideoToolbox::uninit(AVCodecContext *s)
+{
+ av_videotoolbox_default_free(s);
+ if (vtctx)
+ {
+ av_free(vtctx);
+ vtctx = NULL;
+ }
+}
+
+int admCoreVideoToolbox::initVideoToolbox(AVCodecContext *s)
+{
+ int ret = 0;
+
+ AVVideotoolboxContext *vtctx = av_videotoolbox_alloc_context();
+ ADM_assert(vtctx);
+ vtctx->cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8Planar; // lavc defaults to NV12, request YUV420P
+ ret = av_videotoolbox_default_init2(s, vtctx);
+
+ if (ret < 0)
+ {
+ ADM_error("Error %d creating VideoToolbox decoder\n", ret);
+ goto fail;
+ }
+
+ return 0;
+fail:
+ uninit(s);
+ return ret;
+}

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/src/CMakeLists.txt Added

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h Changed

@@ -57,6 +57,9 @@
 
            uint8_t      _allowNull;
            bool         hurryUp;
+           bool         _drain;
+           bool         _done;
+           bool         _endOfStream;
            bool         _setBpp;
            bool         _setFcc;
            int          codecId;
@@ -72,20 +75,25 @@
            uint32_t     _threads;
            ADM_acceleratedDecoderFF *hwDecoder;
            decoderFF_param_t decoderFF_params;
-   
 
 protected:
            uint32_t     frameType (void);
            uint8_t      clonePic (AVFrame * src, ADMImage * out);
            void         decoderMultiThread ();
            uint32_t     admFrameTypeFromLav (AVFrame *pic);
-	
-
 
 public:
                         decoderFF (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
         virtual         ~ decoderFF ();
-            bool        setHwDecoder(ADM_acceleratedDecoderFF *h) {hwDecoder=h;return true;}
+            bool        setHwDecoder(ADM_acceleratedDecoderFF *h)
+                        {
+                            if(h)
+                            {
+                                hwDecoder=h;
+                                return true;
+                            }
+                            return false;
+                        }
             ADM_acceleratedDecoderFF    *getHwDecoder() {return hwDecoder;}
         virtual bool    dontcopy (void)
         {    
@@ -107,7 +115,14 @@
       //  virtual uint32_t getSpecificMpeg4Info (void);
         virtual uint8_t getPARWidth (void);
         virtual uint8_t getPARHeight (void);
-        virtual bool    flush(void);
+        virtual bool decodeErrorHandler(int code, bool headerOnly=false);
+        virtual bool endOfStreamReached(void) { return _endOfStream; }
+        virtual void setEndOfStream(bool reached) { _endOfStream=reached; }
+        virtual bool getDrainingState(void) { return _drain; }
+        virtual void setDrainingState(bool OnOff) { _drain=OnOff; }
+        virtual bool getDrainingInitiated(void) { return _done; }
+        virtual void setDrainingInitiated(bool initiated) { _done=initiated; }
+        virtual bool flush(void);
         virtual const char *getDecoderName(void) 
                           {
                               if(hwDecoder)

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

@@ -164,6 +164,9 @@
 	resetConfiguration();
 
 hurryUp=false;
+ _drain=false;
+ _done=false;
+ _endOfStream=false;
 _setBpp=false;
 _setFcc=false;
 codecId = 0;
@@ -261,6 +264,9 @@
 if (pic->key_frame)
 aprintf ("\n But keyframe is set\n");
 break;
+ case AV_PICTURE_TYPE_NONE:
+ if(codecId == AV_CODEC_ID_HUFFYUV || codecId == AV_CODEC_ID_FFVHUFF)
+ SET(AVI_KEY_FRAME)
 default:
 break;
 }
@@ -309,15 +315,51 @@
 {
 if(_context)
 avcodec_flush_buffers(_context);
+ _drain=false;
+ _done=false;
 return true;
 }
+
+/**
+ \fn decodeErrorHandler
+ \brief Evaluate return value of avcodec_receive_frame
+*/
+bool decoderFF::decodeErrorHandler(int code, bool headerOnly)
+{
+ if(code<0)
+ {
+ switch(code)
+ {
+ case AVERROR_EOF:
+ ADM_warning("[lavc] End of video stream reached\n");
+ setEndOfStream(true);
+ flush();
+ return false;
+ case AVERROR(EAGAIN):
+ ADM_info("[lavc] The decoder expects more input before output can be produced\n");
+ 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;
+ }
+ }
+ }
+ return true;
+}
+
 /**
 \fn uncompress
 \brief Actually decode an image
 */
 bool decoderFF::uncompress (ADMCompressedImage * in, ADMImage * out)
 {
- int got_picture = 0;
 uint8_t *oBuff[3];
 int ret = 0;
 out->_noPicture = 0;
@@ -365,29 +407,49 @@
 _context->reordered_opaque=in->demuxerPts;
 //_frame.opaque=(void *)out->Pts;
 //printf("Incoming Pts :%"PRId64"\n",out->Pts);
- AVPacket pkt;
- av_init_packet(&pkt);
- pkt.data=in->data;
- pkt.size=in->dataLength;
- if(in->flags&AVI_KEY_FRAME)
- pkt.flags=AV_PKT_FLAG_KEY;
- else
- pkt.flags=0;
+ if(_drain)
+ {
+ if(!_done)
+ {
+ avcodec_send_packet(_context, NULL);
+ _done=true;
+ }
+ }else
+ {
+ AVPacket pkt;
+ av_init_packet(&pkt);
+ pkt.data=in->data;
+ pkt.size=in->dataLength;
+ if(in->flags&AVI_KEY_FRAME)
+ pkt.flags=AV_PKT_FLAG_KEY;
+ else
+ pkt.flags=0;
+
+ avcodec_send_packet(_context, &pkt);
+ }
+
+ ret = avcodec_receive_frame(_context, _frame);
+
+ if(!ret)
+ _endOfStream=false;
+ if(!decodeErrorHandler(ret,hurryUp))
+ return false;
 
- ret = avcodec_decode_video2 (_context, _frame, &got_picture, &pkt);
 if(!bFramePossible())
 {
 // No delay, the value is sure, no need to hide it in opaque
 _context->reordered_opaque=(int64_t)in->demuxerPts;
 }
 out->_qStride = 0;		//Default = no quant
+#if 0
 if (0 > ret && !hurryUp)
 {
 printf ("\n[lavc] error in lavcodec decoder!\n");
 printf ("[lavc] Err: %d, size :%d\n", ret, in->dataLength);
 return 0;
 }
- if (!got_picture && !hurryUp)
+#endif
+ if (ret && !hurryUp)
 {
 // Some encoder code a vop header with the
 // vop flag set to 0
@@ -419,7 +481,7 @@
 	 {
 	 out->_noPicture = 1;
 	 }
-	 printf ("\n[lavc] ignoring got pict ==0\n");
+	 printf ("\n[lavc] ignoring that we got no picture\n");
 	 return 1;
 
 	}
@@ -441,20 +503,25 @@
 {
 case AV_PIX_FMT_YUV411P:
 out->_colorspace = ADM_COLOR_YUV411;
+ aprintf("colorspace is AV_PIX_FMT_YUV411P --> ADM_COLOR_YUV411\n");
 break;
 case AV_PIX_FMT_YUYV422:
 out->_colorspace = ADM_COLOR_YUV422;
+ aprintf("colorspace is AV_PIX_FMT_YUYV422 --> ADM_COLOR_YUV422\n");
 break;
 case AV_PIX_FMT_YUV422P:
 case AV_PIX_FMT_YUVJ422P:
 out->_colorspace = ADM_COLOR_YUV422P;
+ aprintf("colorspace is AV_PIX_FMT_YUV422P or AV_PIX_FMT_YUVJ422P --> ADM_COLOR_YUV422P\n");
 break;
 case AV_PIX_FMT_GRAY8:
- out->_colorspace = ADM_COLOR_Y8;
- break;
+ out->_colorspace = ADM_COLOR_Y8;
+ aprintf("colorspace is AV_PIX_FMT_GRAY8 --> ADM_COLOR_Y8\n");
+ break;
 case AV_PIX_FMT_YUV444P:
 case AV_PIX_FMT_YUVJ444P:
 out->_colorspace = ADM_COLOR_YUV444;
+ aprintf("colorspace is AV_PIX_FMT_YUV444P or AV_PIX_FMT_YUVJ444P --> ADM_COLOR_YUV444\n");
 break;
 case AV_PIX_FMT_YUV420P:
 case AV_PIX_FMT_YUVJ420P:
@@ -463,20 +530,28 @@
 // In that case depending on swap u/v
 // we do it or not
 out->_colorspace = ADM_COLOR_YV12;
+ aprintf("colorspace is AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P or AV_PIX_FMT_YUVA420P --> ADM_COLOR_YV12\n");
+ break;
+ case AV_PIX_FMT_BGR24:
+ out->_colorspace = ADM_COLOR_BGR24;
+ aprintf("colorspace is AV_PIX_FMT_BGR24 --> ADM_COLOR_BGR24\n");
+ break;
+ case AV_PIX_FMT_RGB24:
+ out->_colorspace = ADM_COLOR_RGB24;
+ aprintf("colorspace is AV_PIX_FMT_RGB24 --> ADM_COLOR_RGB24\n");
 break;
- case AV_PIX_FMT_BGR24:
- case AV_PIX_FMT_RGB24:
-	 out->_colorspace = ADM_COLOR_BGR24;
-	 break;
 case AV_PIX_FMT_BGR0:
 case AV_PIX_FMT_BGRA:
 out->_colorspace = ADM_COLOR_BGR32A;
+ aprintf("colorspace is AV_PIX_FMT_BGR0 or AV_PIX_FMT_BGRA --> ADM_COLOR_BGR32A\n");
 break;
 case AV_PIX_FMT_RGBA: // ???PIX_FMT_RGBA32:
 out->_colorspace = ADM_COLOR_RGB32A;
+ aprintf("colorspace is AV_PIX_FMT_RGBA --> ADM_COLOR_RGB32A\n");
 break;
 case AV_PIX_FMT_RGB555:
 out->_colorspace = ADM_COLOR_RGB555;
+ aprintf("colorspace is AV_PIX_FMT_RGB555 --> ADM_COLOR_RGB555\n");
 break;
 #if 0
 case AV_PIX_FMT_VDPAU_MPEG1:
@@ -500,6 +575,9 @@
 case AV_PIX_FMT_YUV444P10LE:
 out->_colorspace=ADM_COLOR_YUV444_10BITS;
 break; 
+ case AV_PIX_FMT_YUV422P10LE:
+ out->_colorspace=ADM_COLOR_YUV422_10BITS;
+ break;
 case AV_PIX_FMT_P010LE: 
 out->_colorspace= ADM_COLOR_NV12_10BITS;
 break;
@@ -541,7 +619,7 @@
 bool decoderFFMpeg4::uncompress (ADMCompressedImage * in, ADMImage * out)
 {
 // For pseudo startcode
- if(in->dataLength)
+ if(!_drain && in->dataLength)
 {
 in->data[in->dataLength]=0;
 in->data[in->dataLength+1]=0;
@@ -665,7 +743,7 @@
 char buf[256];
 
 vsnprintf(buf, sizeof(buf), fmt, list);
- if(level<=AV_LOG_INFO)
+ if(buf[0] != '\0' && level<=AV_LOG_INFO)
 ADM_info("[lavc] %s",buf);
 }

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp Changed

@@ -53,11 +53,11 @@
 {
 case 16:
 // FIXME - 16-bit could use a BGR555 or BGR565 colour mask
- colorspace = ADM_COLOR_BGR555;
+ colorspace = ADM_COLOR_RGB555;
 break;
 case 24:
 case 32:
- colorspace = ADM_COLOR_RGB24;
+ colorspace = ADM_COLOR_BGR24;
 break;
 default:
 printf("bpp %d not supported\n", _bpp);
@@ -78,8 +78,8 @@
 for(j = 0; j < _w; j++) // 32 32 32 32
 {
 ptr[0] = buf[1]; // remove alpha channel + reorder. IT would be more efficient to do it in colorspace...
- ptr[1] = buf[0];
- ptr[2] = buf[2];
+ ptr[1] = buf[2];
+ ptr[2] = buf[3];
 ptr += 3;
 buf += 4;
 }

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/CMakeLists.txt Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_bitstream.h Added

@@ -0,0 +1,82 @@
+/***************************************************************************
+                          \fn     libvaEnc_plugin
+                          \brief  Plugin to use libva hw encoder (intel mostly)
+                             -------------------
+
+    copyright            : (C) 2018 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ /***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+/**
+ * 
+ */
+class vaBitstream
+{
+public:
+                vaBitstream();
+                ~vaBitstream();
+        void    stop();
+        void    put_ui(unsigned int val,int size_in_bits);
+        void    put_ue(unsigned int val);
+        void    put_se(signed int val);
+        void    byteAlign(signed int bit);
+        void    rbspTrailingBits();
+        void    startCodePrefix();
+        void    nalHeader(int nal_ref_idc, int nal_unit_type);
+        int     lengthInBits() {return bit_offset;};
+        int     lengthInBytes() { int l=bit_offset;return (l+7)>>3;};
+        void    add1BitIfNotaligned()
+        {
+                if ( bit_offset & 0x7) 
+                {
+                    put_ui(1, 1);
+                }
+        }
+        uint8_t *getPointer() {return  (uint8_t *)buffer;}
+protected:
+    unsigned int *buffer;
+    int          bit_offset;
+    int          max_size_in_dword;
+};

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_buffer.h Added

@@ -0,0 +1,64 @@
+/***************************************************************************
+ \fn ADM_VideoEncoders
+ \brief Internal handling of video encoders
+ -------------------
+ 
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#pragma once
+#include "va/va.h"
+#include "ADM_coreLibVA.h"
+
+/**
+ * 
+ * @param context
+ * @param size
+ * @return 
+ */
+class ADM_vaEncodingBuffers
+{
+public:
+ static ADM_vaEncodingBuffers *allocate(VAContextID context, int size);
+ 
+ VABufferID getId() {return _bufferId;}
+ ~ADM_vaEncodingBuffers();
+ int read(uint8_t *to, int sizeMax); // return # of bytes, <0 on error
+protected:
+ ADM_vaEncodingBuffers();
+ bool setup(VAContextID ctx, int size);
+ VABufferID _bufferId;
+};
+// EOF

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_encodingContext.h Added

@@ -0,0 +1,128 @@
+/***************************************************************************
+ \fn ADM_VideoEncoders
+ \brief Internal handling of video encoders
+ -------------------
+ 
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "ADM_h264_tag.h"
+#pragma once
+
+
+#define CHECK_VA_STATUS_BOOL(x) {VAStatus status=x; if(status!=VA_STATUS_SUCCESS) \
+ { ADM_warning("%s failed at line %d function %s, err code=%d\n",#x,__LINE__,__func__,(int)status);return false;}}
+#include <vector>
+class ADMImage;
+class ADM_vaSurface;
+class ADMBitstream;
+
+/**
+ * 
+ * @param codec
+ * @param alignedWidth
+ * @param alignedHeight
+ * @param knownSurfaces
+ * @return 
+ */
+class ADM_vaEncodingContext
+{
+public:
+ ADM_vaEncodingContext() {}
+ virtual ~ADM_vaEncodingContext() {}
+ virtual bool encode(ADMImage *in, ADMBitstream *out)=0;
+ virtual bool generateExtraData(int *size, uint8_t **data)=0;
+ //static ADM_vaEncodingContext *allocate(int codec, int width, int height, int frameInc,std::vector<ADM_vaSurface *>knownSurfaces); 
+};
+
+
+/**
+ * 
+ * @param profile
+ */
+class vaAttributes
+{
+public:
+ vaAttributes(VAProfile profile)
+ { 
+ for (int i = 0; i < VAConfigAttribTypeMax; i++)
+ attrib[i].type = (VAConfigAttribType)i;
+ ADM_assert(VA_STATUS_SUCCESS==vaGetConfigAttributes(admLibVA::getDisplay(), profile, VAEntrypointEncSlice, &attrib[0], VAConfigAttribTypeMax));
+ }
+ bool isSet(int attribute, int mask)
+ {
+ return attrib[attribute].value & mask;
+ }
+ uint32_t get(VAConfigAttribType key)
+ {
+ return attrib[key].value;
+ }
+
+protected:
+ VAConfigAttrib attrib[VAConfigAttribTypeMax];
+ 
+};
+/**
+ * 
+ */
+class vaSetAttributes
+{
+ 
+public:
+ vaSetAttributes()
+ {
+ xindex=0;
+ }
+ void add(VAConfigAttribType key, int value)
+ {
+ attrib[xindex].type=key;
+ attrib[xindex].value=value;
+ xindex++;
+ }
+ void clean(void)
+ {
+ xindex=0;
+ }
+ int count() const {return xindex;};
+ const VAConfigAttrib *getPointer() const 
+ {
+ return &attrib[0];
+ }
+
+protected:
+ VAConfigAttrib attrib[VAConfigAttribTypeMax]; 
+ int xindex;
+};

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/ADM_coreLibVA_h264Encoding.h Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_bitstream.cpp Added

@@ -0,0 +1,235 @@
+/***************************************************************************
+ \fn libvaEnc_plugin
+ \brief Plugin to use libva hw encoder (intel mostly)
+ -------------------
+
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+ /***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "va/va.h"
+#include "ADM_coreLibVA_bitstream.h"
+/***************************************************************************
+ \fn libvaEnc_plugin
+ \brief Plugin to use libva hw encoder (intel mostly)
+ -------------------
+
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+ /***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#define BITSTREAM_ALLOCATE_STEPPING 4096
+
+
+static unsigned int 
+va_swap32(unsigned int val)
+{
+ unsigned char *pval = (unsigned char *)&val;
+
+ return ((pval[0] << 24) |
+ (pval[1] << 16) |
+ (pval[2] << 8) |
+ (pval[3] << 0));
+}
+
+vaBitstream::vaBitstream()
+{
+ max_size_in_dword = BITSTREAM_ALLOCATE_STEPPING;
+ buffer = (unsigned int *)calloc(max_size_in_dword * sizeof(int), 1);
+ bit_offset = 0; 
+}
+vaBitstream::~vaBitstream()
+{
+ free(buffer);
+ buffer=NULL;
+}
+void vaBitstream::stop()
+{
+ int pos = (bit_offset >> 5);
+ int xbit_offset = (bit_offset & 0x1f);
+ int bit_left = 32 - xbit_offset;
+
+ if (xbit_offset) 
+ {
+ buffer[pos] = va_swap32((buffer[pos] << bit_left));
+ }
+}
+
+void vaBitstream::put_ui(unsigned int val, int size_in_bits)
+{
+ int pos = (bit_offset >> 5);
+ int xbit_offset = (bit_offset & 0x1f);
+ int bit_left = 32 - xbit_offset;
+
+ if (!size_in_bits)
+ return;
+
+ bit_offset += size_in_bits;
+
+ if (bit_left > size_in_bits) {
+ buffer[pos] = (buffer[pos] << size_in_bits | val);
+ } else {
+ size_in_bits -= bit_left;
+ buffer[pos] = (buffer[pos] << bit_left) | (val >> size_in_bits);
+ buffer[pos] = va_swap32(buffer[pos]);
+
+ if (pos + 1 == max_size_in_dword) {
+ max_size_in_dword += BITSTREAM_ALLOCATE_STEPPING;
+ buffer = (unsigned int *)realloc(buffer, max_size_in_dword * sizeof(unsigned int));
+ }
+
+ buffer[pos + 1] = val;
+ }
+}
+
+void vaBitstream::put_ue(unsigned int val)
+{
+ int size_in_bits = 0;
+ int tmp_val = ++val;
+
+ while (tmp_val) {
+ tmp_val >>= 1;
+ size_in_bits++;
+ }
+
+ put_ui( 0, size_in_bits - 1); // leading zero
+ put_ui( val, size_in_bits);
+}
+
+void vaBitstream::put_se(int val)
+{
+ unsigned int new_val;
+
+ if (val <= 0)
+ new_val = -2 * val;
+ else
+ new_val = 2 * val - 1;
+
+ put_ue(new_val);
+}
+
+void vaBitstream::byteAlign(int bit)
+{
+ int xbit_offset = (bit_offset & 0x7);
+ int bit_left = 8 - xbit_offset;
+ int new_val;
+
+ if (!xbit_offset)
+ return;
+
+ assert(bit == 0 || bit == 1);
+
+ if (bit)
+ new_val = (1 << bit_left) - 1;
+ else
+ new_val = 0;
+
+ put_ui(new_val, bit_left);
+}
+
+void vaBitstream::rbspTrailingBits()
+{
+ put_ui( 1, 1);
+ byteAlign(0);
+}
+
+void vaBitstream::startCodePrefix()
+{
+ put_ui( 0x00000001, 32);
+}
+
+void vaBitstream::nalHeader(int nal_ref_idc, int nal_unit_type)
+{
+ put_ui(0, 1); /* forbidden_zero_bit: 0 */
+ put_ui(nal_ref_idc, 2);
+ put_ui(nal_unit_type, 5);
+}
+
+//---
+
+// EOF
+
+

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_buffer.cpp Added

@@ -0,0 +1,120 @@
+/***************************************************************************
+ \fn ADM_VideoEncoders
+ \brief Internal handling of video encoders
+ -------------------
+ 
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_coreLibVA_buffer.h"
+
+#define CHECK_ERROR_BOOL(x) {xError=x;if(xError) {ADM_warning(#x "%d =<%s>\n",xError,vaErrorStr(xError));return false;}}
+#define CHECK_ERROR(x) {xError=x;if(xError) {ADM_warning(#x "%d =<%s>\n",xError,vaErrorStr(xError));}}
+
+static VAStatus xError; // this is not thread safe !
+
+ADM_vaEncodingBuffers::ADM_vaEncodingBuffers()
+{
+ _bufferId=VA_INVALID;
+}
+/**
+ * 
+ * @param ctx
+ * @param size
+ * @return 
+ */
+bool ADM_vaEncodingBuffers::setup(VAContextID ctx, int size)
+{
+ CHECK_ERROR_BOOL( vaCreateBuffer(admLibVA::getDisplay(),ctx,VAEncCodedBufferType,size, 1, NULL, &_bufferId));
+ return true;
+}
+/**
+ */
+ADM_vaEncodingBuffers::~ADM_vaEncodingBuffers()
+{
+ if(_bufferId!=VA_INVALID)
+ {
+ CHECK_ERROR(vaDestroyBuffer(admLibVA::getDisplay(),_bufferId));
+ _bufferId=VA_INVALID;
+ }
+}
+/**
+ */
+ADM_vaEncodingBuffers *ADM_vaEncodingBuffers::allocate(VAContextID context, int size)
+{
+ ADM_vaEncodingBuffers *b=new ADM_vaEncodingBuffers;
+ if(!b->setup(context,size))
+ {
+ ADM_warning("VaEncoder: Buffer creation failed\n");
+ delete b;
+ return NULL;
+ }
+ return b;
+}
+/**
+ * 
+ * @param to
+ * @param sizeMax
+ * @return 
+ */
+int ADM_vaEncodingBuffers::read(uint8_t *data, int sizeMax)
+{
+ VACodedBufferSegment *buf_list = NULL; 
+ xError= vaMapBuffer(admLibVA::getDisplay(),_bufferId,(void **)(&buf_list));
+ CHECK_ERROR(xError)
+ if(xError)
+ {
+ return -1;
+ }
+ int len=0;
+ while (buf_list != NULL) 
+ {
+ int sz=buf_list->size;
+ if(sz+len>sizeMax)
+ {
+ printf("VA buffer readback buffer size exceeded !");
+ ADM_assert(0);
+ }
+ memcpy(data,buf_list->buf,sz);
+ data+=sz;
+ len+=sz;
+ buf_list = (VACodedBufferSegment *) buf_list->next;
+ }
+ vaUnmapBuffer(admLibVA::getDisplay(),_bufferId);
+ return len;
+}
+
+// EOF

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_encodingContext.cpp Added

@@ -0,0 +1,175 @@
+/***************************************************************************
+ \fn ADM_VideoEncoders
+ \brief Internal handling of video encoders
+ -------------------
+ 
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include "ADM_default.h"
+
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+
+#include "va/va.h"
+#include "va/va_enc_h264.h"
+#include "ADM_coreLibVA_buffer.h"
+#include "ADM_coreLibVA_encodingContext.h"
+#include "ADM_coreLibVA_h264Encoding.h"
+
+
+
+bool ADM_initLibVAEncoder(void);
+static bool initDone=false;
+
+ADM_VA_GlobalH264 globalH264Caps;
+const ADM_VA_GlobalH264 *vaGetH264EncoderProfile() {return &globalH264Caps;};
+
+#if 0
+
+/**
+ */
+ADM_vaEncodingContext *ADM_vaEncodingContext::allocate(int codec, int alignedWidth, int alignedHeight, int frameInc,std::vector<ADM_vaSurface *>knownSurfaces)
+{
+ if(!initDone)
+ {
+ if(!init_va())
+ {
+ return NULL;
+ }
+ initDone=true;
+ }
+ // Allocate a new one
+ ADM_vaEncodingContextH264 *r=new ADM_vaEncodingContextH264;
+ if(!r->setup(alignedWidth, alignedHeight, frameInc, knownSurfaces))
+ {
+ delete r;
+ return NULL;
+ }
+ return r;
+}
+#endif
+/* 
+ */
+
+static bool lookupSupportedFormat(VAProfile profile)
+{
+ int num_entrypoints, slice_entrypoint;
+ 
+ // query it several times, but way simpler code
+ num_entrypoints = vaMaxNumEntrypoints(admLibVA::getDisplay());
+ VAEntrypoint *entrypoints = (VAEntrypoint*) alloca(num_entrypoints * sizeof(VAEntrypoint));
+ vaQueryConfigEntrypoints(admLibVA::getDisplay(), profile, entrypoints, &num_entrypoints);
+ for (int slice_entrypoint = 0; slice_entrypoint < num_entrypoints; slice_entrypoint++) 
+ {
+ if (entrypoints[slice_entrypoint] == VAEntrypointEncSlice) 
+ {
+ return true;
+ }
+ }
+ return false;
+}
+/**
+ * 
+ * @return 
+ */
+bool ADM_initLibVAEncoder(void)
+{
+ ADM_info("initializing VA encoder\n");
+ if(lookupSupportedFormat(VAProfileH264High))
+ {
+ ADM_info("H264 High is supported\n");
+ globalH264Caps.profile=VAProfileH264High; 
+ }else
+ if(lookupSupportedFormat(VAProfileH264Main))
+ {
+ ADM_info("H264 Main is supported\n");
+ globalH264Caps.profile=VAProfileH264Main;
+
+ }
+ else
+ {
+ ADM_warning("No support for encoding (H264 High or Main)\n");
+ return false;
+ }
+ 
+ vaAttributes attributes(globalH264Caps.profile);
+ if(!attributes.isSet(VAConfigAttribRTFormat,VA_RT_FORMAT_YUV420))
+ {
+ ADM_warning("YUV420 not supported, bailing\n");
+ return false;
+ }
+ globalH264Caps.newAttributes.clean();
+ globalH264Caps.newAttributes.add(VAConfigAttribRTFormat,VA_RT_FORMAT_YUV420);
+ 
+ uint32_t pack=attributes.get(VAConfigAttribEncPackedHeaders);
+ if(pack!=VA_ATTRIB_NOT_SUPPORTED)
+ { 
+ ADM_info("Support VAConfigAttribEncPackedHeaders\n");
+ 
+ 
+ uint32_t new_value=VA_ENC_PACKED_HEADER_NONE;
+#ifndef ADM_VA_USE_MP4_FORMAT 
+#define CHECK_PACK(x) if(pack & x) {new_value |=x;ADM_info("\t "#x" is supported\n");}
+ CHECK_PACK(VA_ENC_PACKED_HEADER_SEQUENCE)
+ CHECK_PACK(VA_ENC_PACKED_HEADER_PICTURE)
+ CHECK_PACK(VA_ENC_PACKED_HEADER_SLICE)
+ CHECK_PACK(VA_ENC_PACKED_HEADER_MISC)
+#endif 
+ globalH264Caps.packedHeaderCapabilities=new_value;
+ globalH264Caps.newAttributes.add(VAConfigAttribEncPackedHeaders,new_value);
+ }
+
+ int ilaced=attributes.get(VAConfigAttribEncInterlaced);
+ if(ilaced!=VA_ATTRIB_NOT_SUPPORTED)
+ {
+ globalH264Caps.newAttributes.add(VAConfigAttribEncInterlaced,VA_ENC_INTERLACED_NONE);
+ }
+ int h264_maxref_tmp=attributes.get(VAConfigAttribEncMaxRefFrames);
+ if(h264_maxref_tmp!=VA_ATTRIB_NOT_SUPPORTED)
+ { 
+ globalH264Caps.h264_maxref_p0 = h264_maxref_tmp&0xffff;
+ globalH264Caps.h264_maxref_p1 = h264_maxref_tmp>>16;
+ ADM_info("Max ref frame is p0:%d/p1:%d\n",globalH264Caps.h264_maxref_p0,globalH264Caps.h264_maxref_p1);
+ }
+ ADM_info("/initializing VA encoder\n");
+ return true;
+}
+// EOF
+
+

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/CMakeLists.txt Added

avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/CMakeLists.txt Added

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h Changed

@@ -17,7 +17,7 @@
  ***************************************************************************/
 #ifndef ADM_CORE_VIDEO_ENCODER_H
 #define ADM_CORE_VIDEO_ENCODER_H
-
+#include "ADM_default.h"
 #include "ADM_coreVideoEncoder6_export.h"
 #include "ADM_coreVideoFilter.h"
 #include "ADM_bitstream.h"
@@ -59,7 +59,7 @@
 public:
                             ADM_coreVideoEncoder(ADM_coreVideoFilter *src);
 virtual                     ~ADM_coreVideoEncoder();
-virtual        bool         setup(void) {return true;}    /// Call once before using            
+virtual        bool         setup(void) {ADM_info("[videoEncoder] Using default setup , i.e. no setup.\n");return true;}    /// Call once before using            
 virtual        bool         encode (ADMBitstream * out)=0;
 
 virtual        bool         isDualPass(void) {return false;}
@@ -71,7 +71,7 @@
                uint32_t    getFrameIncrement(void) {return source->getInfo()->frameIncrement;}
                uint64_t    getTotalDuration(void) {return source->getInfo()->totalDuration;}
 virtual        bool        setPassAndLogFile(int pass,const char *name) {return false;}
-               uint64_t    getEncoderDelay(void){return encoderDelay;}
+virtual        uint64_t    getEncoderDelay(void){return encoderDelay;}
                uint64_t    lastDts; //
 };
 ADM_COREVIDEOENCODER6_EXPORT bool usSecondsToFrac(uint64_t useconds, int *n,int *d);

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp Changed

@@ -16,6 +16,7 @@
 * *
 ***************************************************************************/
 #include "ADM_default.h"
+#include "ADM_vidMisc.h"
 #include "ADM_coreVideoEncoderFFmpeg.h"
 #include "prefs.h"
 #include "ADM_coreUtils.h"
@@ -79,7 +80,7 @@
 else
 encoderDelay=0;
 ADM_info("[Lavcodec] Using a video encoder delay of %d ms\n",(int)(encoderDelay/1000));
-
+ lastLavPts=0;
 }
 /**
 \fn ADM_coreVideoEncoderFFmpeg
@@ -146,27 +147,14 @@
 _frame->linesize[2] = 0;//w >> 1;
 _frame->format=AV_PIX_FMT_RGB32;
 _context->pix_fmt =AV_PIX_FMT_RGB32;break;
+ case ADM_COLOR_RGB24: _frame->linesize[0] = w*3;
+ _frame->linesize[1] = 0;
+ _frame->linesize[2] = 0;
+ _frame->format = AV_PIX_FMT_RGB24;
+ _context->pix_fmt = AV_PIX_FMT_RGB24;break;
 default: ADM_assert(0);
 
 }
-
- // Eval fps
- uint64_t f=source->getInfo()->frameIncrement;
- // Let's put 100 us as time base
-
-#ifdef TIME_TENTH_MILLISEC
- _context->time_base.num=1;
- _context->time_base.den=10000LL;
-#else
-
- int n,d;
-
- usSecondsToFrac(f,&n,&d);
- // printf("[ff] Converted a time increment of %d ms to %d /%d seconds\n",f/1000,n,d);
- _context->time_base.num=n;
- _context->time_base.den=d;
-#endif
- timeScaler=1000000.*av_q2d(_context->time_base); // Optimize, can be computed once
 return true;
 }
 /**
@@ -214,15 +202,23 @@
 p+=getEncoderDelay();
 _frame->pts= timingToLav(p); //
 if(!_frame->pts) _frame->pts=AV_NOPTS_VALUE;
+ if(_frame->pts!=AV_NOPTS_VALUE && lastLavPts!=AV_NOPTS_VALUE && _frame->pts==lastLavPts)
+ {
+ ADM_warning("Lav PTS collision at frame %" PRIu32", lav PTS=%" PRId64", time %s\n",nb,_frame->pts,ADM_us2plain(p));
+ _frame->pts++;
+ }
+ lastLavPts=_frame->pts;
 
 ADM_timeMapping map; // Store real PTS <->lav value mapping
 map.realTS=p;
 map.internalTS=_frame->pts;
 mapper.push_back(map);
 
- aprintf("Codec> incoming pts=%" PRIu64"\n",image->Pts);
+ aprintf("Codec> real pts=%" PRIu64", internal pts=%" PRId64"\n",p,_frame->pts);
 //printf("--->>[PTS] :%"PRIu64", raw %"PRIu64" num:%"PRIu32" den:%"PRIu32"\n",_frame->pts,image->Pts,_context->time_base.num,_context->time_base.den);
 //
+ int w=getWidth();
+ int h=getHeight();
 switch(targetColorSpace)
 {
 case ADM_COLOR_YV12:
@@ -233,9 +229,6 @@
 
 case ADM_COLOR_YUV422P:
 {
- int w=getWidth();
- int h=getHeight();
-
 if(!colorSpace->convertImage(image,rgbByteBuffer.at(0)))
 {
 printf("[ADM_jpegEncoder::encode] Colorconversion failed\n");
@@ -247,7 +240,25 @@
 break;
 }
 case ADM_COLOR_RGB32A:
- if(!colorSpace->convertImage(image,rgbByteBuffer.at(0)))
+ case ADM_COLOR_RGB24:
+ {
+ ADMImageRefWrittable swap(w,h);
+ int strides[3];
+ uint8_t *ptr[3];
+
+ image->GetPitches(strides);
+ image->GetReadPlanes(ptr);
+
+ swap._planes[0] = ptr[0];
+ swap._planeStride[0] = strides[0];
+
+ swap._planes[1] = ptr[2];
+ swap._planeStride[1] = strides[2];
+
+ swap._planes[2] = ptr[1];
+ swap._planeStride[2] = strides[1];
+
+ if(!colorSpace->convertImage(&swap,rgbByteBuffer.at(0)))
 {
 printf("[ADM_jpegEncoder::encode] Colorconversion failed\n");
 return false;
@@ -256,6 +267,7 @@
 _frame->data[2] = NULL;
 _frame->data[1] = NULL;
 break;
+ }
 default:
 ADM_assert(0);
 }
@@ -294,6 +306,8 @@
 ADM_warning("Encoder produced no data\n");
 pkt.size=0;
 }
+ lavPtsFromPacket=pkt.pts; // some encoders don't set pts in coded_frame
+ packetFlags=pkt.flags;
 return pkt.size; 
 }
 /**
@@ -316,6 +330,17 @@
 _context->flags|=CODEC_FLAG_GLOBAL_HEADER;
 }
 prolog(image);
+ uint64_t inc=source->getInfo()->frameIncrement;
+#ifdef TIME_TENTH_MILLISEC
+ _context->time_base.num=1;
+ _context->time_base.den=10000LL;
+#else
+ int n,d;
+ usSecondsToFrac(inc,&n,&d);
+ _context->time_base.num=n;
+ _context->time_base.den=d;
+#endif
+ timeScaler=1000000.*av_q2d(_context->time_base);
 printf("[ff] Time base %d/%d\n", _context->time_base.num,_context->time_base.den);
 if(_hasSettings && LAVS(MultiThreaded))
 {
@@ -435,13 +460,14 @@
 if(_context->coded_frame)
 {
 pict_type=_context->coded_frame->pict_type;
- keyframe=_context->coded_frame->key_frame;
 }else
 {
 out->len=0;
 ADM_warning("No picture...\n");
 return false;
 }
+ if(packetFlags & AV_PKT_FLAG_KEY)
+ keyframe=true;
 aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d %p\n",out->out_quantizer,pict_type,keyframe,_context->coded_frame);
 out->len=size;
 out->flags=0;
@@ -467,8 +493,10 @@
 
 } else
 {
- if(!getRealPtsFromInternal(_context->coded_frame->pts,&(out->dts),&(out->pts)))
- return false;
+ if(lavPtsFromPacket==AV_NOPTS_VALUE)
+ return false;
+ if(!getRealPtsFromInternal(lavPtsFromPacket,&(out->dts),&(out->pts)))
+ return false;
 }
 // update lastDts
 lastDts=out->dts;
@@ -582,6 +610,16 @@
 _context->p_masking = 0.0;
 
 // Set frame rate den/num
+ uint64_t inc=source->getInfo()->frameIncrement;
+#ifdef TIME_TENTH_MILLISEC
+ _context->time_base.num=1;
+ _context->time_base.den=10000LL;
+#else
+ int n,d;
+ usSecondsToFrac(inc,&n,&d);
+ _context->time_base.num=n;
+ _context->time_base.den=d;
+#endif
 prolog(image);
 return true;
 }

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterBridge.h -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterBridge.h Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilter.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilter.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp -> avidemux_2.7.1.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_core/CMakeLists.txt Changed

@@ -30,6 +30,7 @@
 include(admAsNeeded)
 INCLUDE(admCheckVDPAU)
 INCLUDE(admCheckLibVA)
+INCLUDE(admCheckVideoToolbox)
 
 #########################################
 # Debug Summary
@@ -68,8 +69,12 @@
 IF(WIN32)# AND NOT MSVC)
    INCLUDE(admCheckDxva2)
 ELSE(WIN32)
+    IF(UNIX AND NOT APPLE)
         checkVDPAU()
         checkLibVA()
+    ELSE(UNIX AND NOT APPLE)
+        checkVideoToolbox()
+    ENDIF(UNIX AND NOT APPLE)
 ENDIF(WIN32)# AND NOT MSVC)
 
 ########################################
@@ -147,10 +152,14 @@
 ENDIF(USE_VDPAU)
 IF(USE_LIBVA)
    ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/" ADM_coreLibVA )     
+   ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/include/" ADM_coreLibVAEnc )     
 ENDIF(USE_LIBVA)
 IF(USE_DXVA2)
    ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/" ADM_coreDxva2 )     
 ENDIF(USE_DXVA2)
+IF(USE_VIDEOTOOLBOX)
+    ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/include/" ADM_coreVideoToolbox)
+ENDIF(USE_VIDEOTOOLBOX)
 
 SET(CMAKE_TOP_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../cmake/")

avidemux_2.7.1.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.3.7.tar.bz2 Added

avidemux_2.7.1.tar.gz/avidemux_core/ffmpeg_package/patches/upstream Added

avidemux_2.7.1.tar.gz/avidemux_core/ffmpeg_package/patches/upstream/0001-mpegdec-fix-redundant-dummy-frames-issue-of-interlac.patch Added

@@ -0,0 +1,42 @@
+From fd7cb86468cc63b5bda203d74964584281318cda Mon Sep 17 00:00:00 2001
+From: Zhong Li <zhong.li@intel.com>
+Date: Sat, 30 Sep 2017 11:22:57 +0800
+Subject: [PATCH] mpegdec: fix redundant dummy frames issue of interlaced clips
+
+It is to fix https://trac.ffmpeg.org/ticket/6677. Actucally it is a
+regression of commit 99e07a4453732058df90885f80b3db3b4f37cb3c which
+always inserts a dummy frame when decode the first key field picture.
+
+Signed-off-by: Zhong Li <zhong.li@intel.com>
+Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+---
+ libavcodec/mpegvideo.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
+index 82b94253ae..c4089972f0 100644
+--- a/libavcodec/mpegvideo.c
++++ b/libavcodec/mpegvideo.c
+@@ -1283,8 +1283,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
+ s->pict_type, s->droppable);
+ 
+ if ((!s->last_picture_ptr || !s->last_picture_ptr->f->buf[0]) &&
+- (s->pict_type != AV_PICTURE_TYPE_I ||
+- s->picture_structure != PICT_FRAME)) {
++ (s->pict_type != AV_PICTURE_TYPE_I)) {
+ int h_chroma_shift, v_chroma_shift;
+ av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
+ &h_chroma_shift, &v_chroma_shift);
+@@ -1294,9 +1293,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
+ else if (s->pict_type != AV_PICTURE_TYPE_I)
+ av_log(avctx, AV_LOG_ERROR,
+ "warning: first frame is no keyframe\n");
+- else if (s->picture_structure != PICT_FRAME)
+- av_log(avctx, AV_LOG_DEBUG,
+- "allocate dummy last picture for field based first keyframe\n");
+ 
+ /* Allocate a dummy frame */
+ i = ff_find_unused_picture(s->avctx, s->picture, 0);
+-- 
+2.14.1
+

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp Changed

@@ -77,8 +77,8 @@
 {WAV_MP2,AD_MEDIUM_QUAL},
 {WAV_FLAC,AD_MEDIUM_QUAL},
 {WAV_AC3,AD_LOW_QUAL}, // liba52 preferred ???
- {WAV_AAC,AD_LOW_QUAL}, // libfaad preferred ???
- {0x706D,AD_LOW_QUAL},
+ {WAV_AAC,AD_MEDIUM_QUAL},
+ {0x706D,AD_MEDIUM_QUAL},
 {WAV_EAC3,AD_MEDIUM_QUAL},
 {WAV_OGG_VORBIS,AD_HIGH_QUAL},
 };
@@ -416,6 +416,9 @@
 \fn run
 
 */
+
+#define CHECK_CONTENT(n)
+
 uint8_t ADM_AudiocoderLavcodec::run(uint8_t *inptr, uint32_t nbIn, float *outptr, uint32_t *nbOut)
 {
 
@@ -451,6 +454,22 @@
 _head+=out; // consumed bytes
 if(!gotData)
 continue;
+ bool invalid=false;
+ int toCheck=1;
+ if(_context->sample_fmt==AV_SAMPLE_FMT_FLTP || _context->sample_fmt==AV_SAMPLE_FMT_S32P)
+ toCheck=channels;
+ 
+
+ for(int i=0;i<toCheck;i++)
+ {
+ if(!_frame->data[i]) // no data inside, abort
+ {
+ invalid=true;
+ break;
+ }
+ }
+ if(invalid) 
+ continue;
 switch(_context->sample_fmt)
 {
 case AV_SAMPLE_FMT_FLT: decodeToFloat(&outptr,nbOut);break;
@@ -474,8 +493,11 @@
 DOIT(FRONT_RIGHT,FRONT_RIGHT);
 DOIT(FRONT_CENTER,FRONT_CENTER);
 DOIT(LOW_FREQUENCY,LFE);
- DOIT(SIDE_LEFT,REAR_LEFT);
- DOIT(SIDE_RIGHT,REAR_RIGHT); // AV_CH_SIDE_LEFT
+ DOIT(SIDE_LEFT,REAR_LEFT) // see https://trac.ffmpeg.org/ticket/3160
+ DOIT(SIDE_RIGHT,REAR_RIGHT)
+ // as long as we don't support 7.1, we map both side and back channels to ADM_CH_REAR_*
+ DOIT(BACK_LEFT,REAR_LEFT)
+ DOIT(BACK_RIGHT,REAR_RIGHT)
 }
 
 return 1;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp Changed

@@ -29,6 +29,9 @@
 #define BUFFER_SIZE (500*48000)
 #define aprintf(...) {}
 
+#ifndef verify_noerr
+    #define verify_noerr(x) {if((x)!=0) ADM_assert(0);}
+#endif
 
 ADM_DECLARE_AUDIODEVICE(CoreAudio,coreAudioDevice,1,0,2,"Core Audio Plugin  (c) mean");
 
@@ -77,11 +80,13 @@
 */
 bool coreAudioDevice::localStop(void) 
 {
-	if (_inUse)
-		verify_noerr(AudioOutputUnitStop(theOutputUnit));
-
-	// Clean up
-	CloseComponent(theOutputUnit);
+    if (_inUse)
+    {
+        verify_noerr(AudioOutputUnitStop(theOutputUnit));
+        // Clean up
+        verify_noerr(AudioUnitUninitialize(theOutputUnit));
+        verify_noerr(AudioComponentInstanceDispose(theOutputUnit));
+    }
 	_inUse=0;
         ADM_usleep(10*1000);
 	return 1;
@@ -135,6 +140,7 @@
         if(avail>sizeOf10ms*5) // buffer filling up, sleep a bit
         {
                 mutex.unlock();
+                if(stopRequest!=AUDIO_DEVICE_STARTED) return;
                 ADM_usleep(20*1000);
                 goto again;
         }

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_audioEncoders/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/CMakeLists.txt Changed

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/CMakeLists.txt Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp Added

@@ -0,0 +1,279 @@
+/***************************************************************************
+ copyright : (C) 2017 mean
+ email : fixounet@free.fr
+
+ Interface to FAAC
+
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include <math.h>
+
+#include "ADM_default.h"
+#include "DIA_factory.h"
+#include "DIA_coreToolkit.h"
+
+#include "audioencoder.h"
+#include "audioencoderInternal.h"
+#include "DIA_coreToolkit.h"
+
+#include "opus/opus.h"
+#include "audioencoder_opus.h"
+
+#include "opus_encoder_desc.cpp"
+
+#define OPUS_DEFAULT_CONF {128}
+
+static opus_encoder defaultConfig = OPUS_DEFAULT_CONF;
+
+static bool configure(CONFcouple **setup);
+static void getDefaultConfiguration(CONFcouple **c);
+
+/********************* Declare Plugin *****************************************************/
+ADM_DECLARE_AUDIO_ENCODER_PREAMBLE(AUDMEncoder_Opus);
+
+static ADM_audioEncoder encoderDesc = { 
+ ADM_AUDIO_ENCODER_API_VERSION,
+ create,			// Defined by macro automatically
+ destroy,			// Defined by macro automatically
+ configure,		//** put your own function here**
+ "Opus", 
+ "Opus Encoder", 
+ "Opus encoder plugin Mean 2017",
+ 2, // Max channels
+ 1,0,0, // Version
+ WAV_OPUS,
+ 200, // Priority
+ 
+ NULL, //** put your own function here**
+ getDefaultConfiguration,
+ NULL
+};
+ADM_DECLARE_AUDIO_ENCODER_CONFIG( );
+/**
+ * 
+ * @param s
+ */
+static void OpusError(const char *s)
+{
+ GUI_Error_HIG("Opus",QT_TRANSLATE_NOOP("Opus",s));
+}
+
+/**
+ * \fn ctor
+ * @param instream
+ * @param globalHeader
+ * @param setup
+ */
+
+AUDMEncoder_Opus::AUDMEncoder_Opus(AUDMAudioFilter * instream,bool globalHeader,
+ CONFcouple *setup) :ADM_AudioEncoder (instream,setup)
+{
+ uint32_t channels;
+ channels=instream->getInfo()->channels;
+ _globalHeader=globalHeader;
+ _handle=NULL;
+ switch(channels)
+ {
+ case 1:
+ outputChannelMapping[0] = ADM_CH_MONO;
+ break;
+ case 2:
+ 	outputChannelMapping[0] = ADM_CH_FRONT_LEFT;
+ 	outputChannelMapping[1] = ADM_CH_FRONT_RIGHT;
+ break;
+ default :
+ ADM_warning("Unsupported channel mapping\n");
+ break;
+ }
+ wavheader.encoding=WAV_OPUS;
+ _config=defaultConfig;
+ if(setup) // load config if possible
+ ADM_paramLoad(setup,opus_encoder_param,&_config);
+};
+
+/**
+ \fn ~AUDMEncoder_Opus
+*/
+AUDMEncoder_Opus::~AUDMEncoder_Opus()
+{
+ if(_handle)
+ opus_encoder_destroy(_handle);
+ _handle=NULL;
+ printf("[Opus] Deleting faac\n");
+
+};
+
+
+/**
+ \fn initialize
+
+*/
+bool AUDMEncoder_Opus::initialize(void)
+{
+int ret=0;
+int channels=wavheader.channels;
+
+ printf("[Opus] Incoming Fq :%u\n",wavheader.frequency);
+ if(channels>2)
+ {
+ ADM_warning("Unsupported channel configuration\n");
+ return false;
+ }
+ switch(wavheader.frequency)
+ {
+ case 8000:
+ case 12000:
+ case 16000:
+ case 24000:
+ case 48000:
+ break;
+ default:
+ OpusError("Unsupported frequency :\n Only 8, 12, 16, 24 and 48 kHz are supported.");
+ return false; 
+ }
+ //
+ int ratio=(wavheader.frequency+26)/50; // 20ms frames, so we have ratio frames per sec
+ // 48k => 960 ratio
+ if(_config.bitrate*1000 < 3*ratio*8)
+ {
+ OpusError("Bitrate is too low for that frequency.");
+ ADM_warning("Bitrate is too low (%d vs %d)\n",_config.bitrate*1000,ratio);
+ return false; 
+ }
+ 
+ //
+ int err=0;
+ _handle = opus_encoder_create(wavheader.frequency,wavheader.channels,OPUS_APPLICATION_AUDIO ,&err);
+ if(!_handle)
+ {
+ ADM_warning("[Opus ]Cannot open opus with fq=%d, channel=%d, error=%d\n",wavheader.frequency,wavheader.channels, err);
+ return false;
+ }
+ //
+ int r=opus_encoder_ctl(_handle,OPUS_SET_BITRATE(_config.bitrate*1000));
+ if(r<0)
+ {
+ ADM_warning("Failed to set bitrate to %d kbps\n",_config.bitrate);
+ return false;
+ }
+ int br;
+ opus_encoder_ctl(_handle,OPUS_GET_BITRATE(&br));
+ ADM_info("Bitrate : Asked %d, actually set = %d\n",_config.bitrate,br);
+ // update
+ wavheader.byterate=(_config.bitrate*1000)/8;
+ wavheader.blockalign=1;
+ wavheader.bitspersample=0;
+ wavheader.encoding=WAV_OPUS;
+ return true;
+}
+#define SIZE_INTERNAL 64*1024 
+#define FA_BUFFER_SIZE (SIZE_INTERNAL/4)
+
+
+/**
+ \fn encode
+*/
+bool	AUDMEncoder_Opus::encode(uint8_t *dest, uint32_t *len, uint32_t *samples)
+{
+ uint32_t count=0; 
+ int channels=wavheader.channels;
+ opus_int32 done;
+ 
+ int processedSamples=(20*wavheader.frequency)/1000; // xx ms worth of data
+ int sixty=processedSamples*channels;
+ 
+ while(1)
+ {
+ count++;
+ if(!refillBuffer(sixty ))
+ {
+ return false; 
+ }
+ ADM_assert(tmptail>=tmphead);
+ 
+ 
+#if 1 
+ done=opus_encode_float(_handle,&(tmpbuffer[tmphead]),
+ processedSamples,
+ dest,
+ 4*4000); 
+#else
+ dither16 (&(tmpbuffer[tmphead]), processedSamples, channels);
+ done=opus_encode(_handle,(opus_int16 *)&(tmpbuffer[tmphead]),processedSamples,
+ dest,
+ 4000); 
+#endif 
+ tmphead+=sixty; 
+ //printf("processed sample = %d, output = %d\n",processedSamples,done); 
+ if(done<=0) 
+ {
+ if(count<20)
+ continue;
+ return false;
+ }
+ break;
+ }
+ *len=done; 
+ *samples=processedSamples;
+ return true;
+}
+#define SZT(x) sizeof(x)/sizeof(diaMenuEntry )
+#define BITRATE(x) {x,QT_TRANSLATE_NOOP("faac",#x)}
+
+/**
+ \fn configure
+*/
+bool configure (CONFcouple **setup)
+{
+ int ret=0;
+ opus_encoder config=defaultConfig;
+ if(*setup)
+ {
+ ADM_paramLoad(*setup,opus_encoder_param,&config);
+ }
+ diaMenuEntry bitrateM[]={
+ BITRATE(24),
+ BITRATE(32),
+ BITRATE(48),
+ BITRATE(56),
+ BITRATE(64),
+ BITRATE(80),
+ BITRATE(96),
+ BITRATE(112),
+ BITRATE(128)
+ 
+ };
+ diaElemMenu bitrate(&(config.bitrate), QT_TRANSLATE_NOOP("Opus","_Bitrate:"), SZT(bitrateM),bitrateM);
+ 
+ 
+
+ diaElem *elems[]={&bitrate};
+ 
+ if ( diaFactoryRun(QT_TRANSLATE_NOOP("faac","Opus Configuration"),1,elems))
+ {
+ if(*setup) delete *setup;
+ *setup=NULL;
+ ADM_paramSave(setup,opus_encoder_param,&config);
+ defaultConfig=config;
+ return true;
+ }
+ return false;
+}
+/**
+ * \fn getDefaultConfiguration
+ * @param c
+ */
+void getDefaultConfiguration(CONFcouple **c)
+{
+	opus_encoder config = OPUS_DEFAULT_CONF;
+	ADM_paramSave(c, opus_encoder_param, &config);
+}
+// EOF

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.h Added

@@ -0,0 +1,35 @@
+
+/***************************************************************************
+    copyright            : (C) 2017 mean (c)
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "opus_encoder.h"
+/** \class AUDMEncoder_Opus
+ *  \brief Wrapper around opus encoder library
+ * 
+ */
+class AUDMEncoder_Opus : public ADM_AudioEncoder
+{
+protected:
+        OpusEncoder    *_handle;
+        uint32_t        _chunk;
+        bool           _globalHeader;
+        opus_encoder   _config;
+public:
+            bool        initialize(void);
+    virtual             ~AUDMEncoder_Opus();
+                        AUDMEncoder_Opus(AUDMAudioFilter *instream,bool globalHeader,CONFcouple *setup);
+    virtual bool	encode(uint8_t *dest, uint32_t *len, uint32_t *samples);
+};
+
+// EOF
\ No newline at end of file

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/opus_encoder.conf Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/opus_encoder.h Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/opus_encoder_desc.cpp Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/opus_encoder_json.cpp Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_autoScrips/PSP.py -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_autoScrips/PSP.py Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_autoScrips/dvd.py -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_autoScrips/dvd.py Changed

@@ -84,15 +84,15 @@
   if(True==reencode):
       if(channels!=2):
           adm.audioSetMixer(i,"STEREO")
-      adm.audioCodec(i,"Aften","bitrate=224","mode=0")
+      adm.audioCodec(i,"LavAC3","bitrate=224")
 ##################################
 #  Video
 ##################################
-ff_ar=0
+ff_ar="widescreen=False"
 if(resizer.ar==ADM_image.AR_16_9):
-    ff_ar=1
+    ff_ar="widescreen=True"
 #
-adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=0:_4MV=0:_QPEL=0:_TRELLIS_QUANT=1:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=0:bff=0:widescreen="+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=0:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=0:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=0:use_xvid_ratecontrol=0:bufferSize=224:override_ratecontrol=0:dummy=0","matrix=0")            
+adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=False:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=224:override_ratecontrol=False:dummy=0","matrix=0")
 ###################################
 # Container = Mpeg PS/DVD
 ###################################

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_autoScrips/lib/ADM_image.py -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_autoScrips/lib/ADM_image.py Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_autoScrips/lib/ADM_imageInfo.py -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_autoScrips/lib/ADM_imageInfo.py Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_autoScrips/svcd.py -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_autoScrips/svcd.py Changed

@@ -91,11 +91,11 @@
 ##################################
 #  Video
 ##################################
-ff_ar=0
+ff_ar="widescreen=False"
 if(resizer.ar==ADM_image.AR_16_9):
-    ff_ar=1
+    ff_ar="widescreen=True"
 #
-adm.videoCodec("ffMpeg2","params=CQ=4","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=0:_4MV=0:_QPEL=0:_TRELLIS_QUANT=1:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:minBitrate=0:maxBitrate=2400:user_matrix=1:gop_size=18:interlaced=0:bff=0:widescreen="+str(ff_ar)+":mb_eval=2:vratetol=8000:is_temporal_cplx_masking=0:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=0:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=0:use_xvid_ratecontrol=0:bufferSize=112:override_ratecontrol=0:dummy=0","matrix=1")
+adm.videoCodec("ffMpeg2","params=CQ=4","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=False:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:minBitrate=0:maxBitrate=2400:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=112:override_ratecontrol=False:dummy=0","matrix=1")
 
 ###################################
 # Container = Mpeg PS/DVD

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_autoScrips/vcd.py -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_autoScrips/vcd.py Changed

@@ -84,11 +84,11 @@
 ##################################
 #  Video
 ##################################
-ff_ar=0
-if(dest.ar==ADM_image.AR_16_9):
-    ff_ar=1
+ff_ar="widescreen=False"
+if(resizer.ar==ADM_image.AR_16_9):
+    ff_ar="widescreen=True"
 #
-adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=0:_4MV=0:_QPEL=0:_TRELLIS_QUANT=1:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=0:bff=0:widescreen="+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=0:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=0:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=0:use_xvid_ratecontrol=0:bufferSize=224:override_ratecontrol=0:dummy=0","matrix=0")            
+adm.videoCodec("ffMpeg2","params=CQ=2","lavcSettings=:version=2:MultiThreaded=2:me_method=5:_GMC=False:_4MV=False:_QPEL=False:_TRELLIS_QUANT=True:qmin=2:qmax=31:max_qdiff=3:max_b_frames=2:mpeg_quant=1:is_luma_elim_threshold=1:luma_elim_threshold=4294967294:is_chroma_elim_threshold=1:chroma_elim_threshold=4294967291:lumi_masking=0.050000:is_lumi_masking=1:dark_masking=0.010000:is_dark_masking=1:qcompress=0.500000:qblur=0.500000:"+"minBitrate=0:maxBitrate=9500:user_matrix=1:gop_size=18:interlaced=False:bff=False:"+str(ff_ar)+":"+"mb_eval=2:vratetol=8000:is_temporal_cplx_masking=False:temporal_cplx_masking=0.000000:is_spatial_cplx_masking=False:spatial_cplx_masking=0.000000:_NORMALIZE_AQP=False:use_xvid_ratecontrol=False:bufferSize=224:override_ratecontrol=False:dummy=False","matrix=0")
 ###################################
 # Container = Mpeg PS/DVD
 ###################################

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp Changed

@@ -120,6 +120,16 @@
 {
 ADM_ebml_file seekHead( &ebml,alen);
 readSeekHead(&seekHead);
+ }else 
+ { // No valid seek_head, try to find MKV_TRACKS
+ ADM_info("Searching for MKV_TRACKS\n");
+ int headerLen;
+ uint64_t bodyLen;
+ if(!ebml.findContainerOfSecondary(MKV_SEGMENT,MKV_TRACKS,true, &_trackPosition, &headerLen,&bodyLen))
+ {
+ ADM_warning("Cannot locate MKV_TRACKS\n");
+ return false;
+ }
 }
 /* Now find tracks */
 /* And analyze them */
@@ -170,24 +180,22 @@
 for(int i=0;i<1+_nbAudioTrack;i++)
 ADM_info("Track %" PRIu32" has an index size of %d entries\n",i,_tracks[i].index.size());
 
+ int last=_tracks[0].index.size();
+ if(isVC1Compatible(_videostream.fccHandler))
+ {
+ mkvTrak *vid=_tracks;
 
- if(isVC1Compatible(_videostream.fccHandler))
- {
- int nb=_tracks[0].index.size();
- mkvTrak *vid=_tracks;
-
- ADM_warning("Deleting timestamps. For VC1, they are often wrong\n");
- for(int i=1;i<nb-1;i++)
- vid->index[i].Pts=ADM_NO_PTS;
- }
+ ADM_warning("Deleting timestamps. For VC1, they are often wrong\n");
+ for(int i=1;i<last-1;i++)
+ vid->index[i].Pts=ADM_NO_PTS;
+ }
 // Delay frames + recompute frame duration
 // now that we have a good frameduration and max pts dts difference, we can set a proper DTS for all video frame
 uint32_t ptsdtsdelta, mindelta;
- bool hasBframe;
- ComputeDeltaAndCheckBFrames(&mindelta, &ptsdtsdelta,&hasBframe);
-
+ bool hasBframe=false;
+ if(last>1)
+ ComputeDeltaAndCheckBFrames(&mindelta, &ptsdtsdelta, &hasBframe);
 
- int last=_tracks[0].index.size();
 uint64_t increment=_tracks[0]._defaultFrameDuration;
 uint64_t lastDts=0;
 _tracks[0].index[0].Dts=0;
@@ -204,9 +212,13 @@
 vid->index[i].Dts=lastDts;
 continue;
 }
- uint64_t limitDts=vid->index[i].Pts-ptsdtsdelta;
+ uint64_t limitDts=0;
+ if(vid->index[i].Pts>ptsdtsdelta)
+ limitDts=vid->index[i].Pts-ptsdtsdelta;
 if( lastDts<limitDts)
 {
+ if(limitDts-lastDts>1000) // not just a rounding error
+ ADM_warning("Bumping DTS by %" PRIu64" ms to keep PTS/DTS delta within limits for frame %d\n",(limitDts-lastDts)/1000,i);
 lastDts=limitDts;
 }
 vid->index[i].Dts=lastDts;
@@ -224,6 +236,10 @@
 if(enforePtsGreaterThanDts)
 {
 ADM_info("Have to delay by %" PRIu64" us so that PTS>DTS\n",enforePtsGreaterThanDts);
+ if(enforePtsGreaterThanDts>ptsdtsdelta)
+ {
+ ADM_warning("The delay is implausibly high. The calculated frame rate is probably too low.\n");
+ }
 for(int i=0;i<_nbAudioTrack+1;i++)
 delayTrack(i,&(_tracks[i]),enforePtsGreaterThanDts);
 }
@@ -238,29 +254,53 @@
 
 if(last)
 {
- float duration=_tracks[0].index[last-1].Pts;
- duration/=1000;
- uint32_t duration32=(uint32_t)duration;
- printf("[MKV] Video Track duration for %u ms\n",duration32);
- // Useless.....
-
-
+ for(int i=last-32;i<last;i++)
+ {
+ if(i<0) continue;
+ if(_tracks[0].index[i].Pts==ADM_NO_PTS) continue;
+ if(_tracks[0].duration<_tracks[0].index[i].Pts)
+ _tracks[0].duration=_tracks[0].index[i].Pts;
+ }
+ _tracks[0].duration+=increment;
+ uint32_t duration32=(uint32_t)((_tracks[0].duration+500)/1000);
+ printf("[MKV] Video track duration: %s (%u ms)\n",ADM_us2plain(_tracks[0].duration),duration32);
+ // Useless.....
 
 for(int i=0;i<_nbAudioTrack;i++)
 {
 rescaleTrack(&(_tracks[1+i]),duration32);
- if(_tracks[1+i].wavHeader.encoding==WAV_OGG_VORBIS)
+ switch(_tracks[1+i].wavHeader.encoding)
 {
- printf("[MKV] Reformatting vorbis header for track %u\n",i);
- reformatVorbisHeader(&(_tracks[1+i]));
+ case WAV_OGG_VORBIS: 
+ ADM_info("[MKV] Reformatting vorbis header for track %u\n",i);
+ reformatVorbisHeader(&(_tracks[1+i]));
+ break;
+ case WAV_PCM:
+ case WAV_LPCM:
+ ADM_info("[MKV] Checking PCM block size for track %i\n",i);
+ _tracks[i+1]._needBuffering=isBufferingNeeded(&(_tracks[i+1]));
+ break;
+ default:
+ break;
+ 
 }
+ 
+ 
 }
 }
- _access=new mkvAccess *[_nbAudioTrack];
+ _access=new ADM_audioAccess *[_nbAudioTrack];
 _audioStreams=new ADM_audioStream *[_nbAudioTrack];
 for(int i=0;i<_nbAudioTrack;i++)
 {
- _access[i]=new mkvAccess(_filename,&(_tracks[i+1]));
+ if(_tracks[i+1]._needBuffering)
+ {
+ mkvAccess *access=new mkvAccess(_filename,&(_tracks[i+1]));
+ _access[i]=new mkvAccessBuffered(access,_tracks[i+1]._needBuffering);
+ }
+ else
+ {
+ _access[i]=new mkvAccess(_filename,&(_tracks[i+1]));
+ }
 _audioStreams[i]=ADM_audioCreateStream(&(_tracks[1+i].wavHeader), _access[i]);;
 _audioStreams[i]->setLanguage(_tracks[1+i].language);
 }
@@ -329,7 +369,6 @@
 int64_t delta,maxDelta=0;
 int64_t minDelta=100000000;
 *bFramePresent=false;
- int nbValidDts=0;
 
 
 
@@ -362,8 +401,6 @@
 // the maximum will give us the max PTS-DTS delta so that we can compute DTS
 for(int i=0;i<nb-1;i++)
 {
- if(track->index[i].Dts!=ADM_NO_PTS)
- nbValidDts++;
 if(track->index[i].flags==AVI_B_FRAME) nbBFrame++;
 if(track->index[i+1].Pts==ADM_NO_PTS || track->index[i].Pts==ADM_NO_PTS)
 continue;
@@ -377,11 +414,12 @@
 }
 if(delta<minDelta) minDelta=delta;
 if(delta>maxDelta) maxDelta=delta;
- //printf("\/=%" PRId64" Min %" PRId64" MAX %" PRId64"\n",delta,minDelta,maxDelta);
+ // ADM_warning("Delta=%d, MinDelta=%d MaxDelta=%d\n",delta,minDelta,maxDelta);
 }
 }
 if(nbBFrame) *bFramePresent=true;
 
+ ADM_warning(">>> MinDelta=%d MaxDelta=%d\n",minDelta,maxDelta);
 int stdFrameRate=getStdFrameRate(track->_defaultFrameDuration);
 
 int num= _videostream.dwScale;
@@ -420,13 +458,18 @@
 ADM_info("Deviation = %d\n",deviation);
 ADM_info("DeviationMinDelta = %d\n",deviationMinDelta);
 ADM_info("Deviation skip = %d\n",minDeltaSkip);
- 
- if(minDeltaSkip>skipped*3) // we are skipping a lot more frame, fps too high
+ bool skipValid=true;
+ if(track->_defaultFrameDuration)
+ {
+ ADM_info("MinDelta=%d, defaultFrameDuation=%d\n",minDelta,track->_defaultFrameDuration);
+ if((minDelta*2)<=track->_defaultFrameDuration)
+ skipValid=false;
+ }
+ if(minDeltaSkip>skipped*3 && skipValid) // we are skipping a lot more frame, fps too high
 {
- ADM_info("Too many skipped frames, dropping candidates\n");
+ ADM_info("Too many skipped frames, dropping candidates (skipped=%d, min delta skip=%d)\n",skipped,minDeltaSkip);
 deviationMinDelta=deviation*2;
 }
- 
 if(minDelta)
 {
 bool preferMinDelta=false;
@@ -481,9 +524,6 @@
 minDelta=100000000;
 for(int i=0;i<nb-1;i++)
 {
- if(track->index[i].Dts!=ADM_NO_PTS)
- nbValidDts++;
- if(track->index[i].flags==AVI_B_FRAME) nbBFrame++;
 if(track->index[i+1].Pts==ADM_NO_PTS || track->index[i].Pts==ADM_NO_PTS)
 continue;
 
@@ -520,34 +560,6 @@
 
 ADM_info("First frame pts %" PRId64" us\n",track->index[0].Pts);
 
- if(nbValidDts<3)
- {
- ADM_warning("Not enough valid DTS (%d)\n",(int)nbValidDts);
- *minDeltaX=minDelta;
- *maxDeltaX=0;
- return false;
- }
-
-
- uint64_t adj=0;
- int limit=32;
- if(limit>nb) limit=nb;
- // Pts must be >= maxDelta for all frames, the first 32 will do
- for(int i=0;i<limit;i++)
- {
- if(maxDelta>track->index[i].Pts)
- {
- uint64_t newAdj=maxDelta-track->index[i].Pts;
- if(newAdj>adj) adj=newAdj;
- }
- }
- if(adj) // need to correct
- {
- ADM_info("Delaying video by %" PRIu64" us\n",adj);
- ADM_info("[mkv] Delaying audio by %" PRIu64" us\n",adj);
- for(int i=0;i<_nbAudioTrack+1;i++)
- delayTrack(i,&(_tracks[i]),adj);
- }
 *maxDeltaX=maxDelta;
 *minDeltaX=minDelta;
 return true;
@@ -877,7 +889,7 @@
 {
 uint32_t limit=_tracks[0].index.size();
 if(!limit) return 0;
- return _tracks[0].index[limit-1].Pts+_tracks[0]._defaultFrameDuration;
+ return _tracks[0].duration;
 }
 
 /**
@@ -943,7 +955,6 @@
 *hd=p;
 return x;
 }
-
 /**
 \fn mkreformatVorbisHeader
 \brief reformat oggvorbis header to avidemux style
@@ -1106,5 +1117,30 @@
 return true;
 }
 
+/**
+ * 
+ * @param trk
+ * \brief Make sure the one chunk is not too big, split it else
+ * ~ 40ms worth of data are good enough
+ * @return 
+ */
+int mkvHeader::isBufferingNeeded(mkvTrak *trk)
+{
+ int n=trk->index.size();
+ int max=0;
+ for(int i=0;i<n;i++)
+ {
+ int sz=trk->index[i].size;
+ if(max<sz) max=sz;
+ }
+ if(max<64*1024)
+ {
+ ADM_info("No big packet detected\n");
+ return 0;
+ }
+ max=((max>>10)+1)<<10;
+ ADM_warning("Big packet detected : %d kBytes \n",max>>10);
+ return max;
+}
 //****************************************
 //EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h Changed

@@ -62,6 +62,7 @@
         _sizeInBytes=0;
         _defaultFrameDuration=0;
         language=ADM_UNKNOWN_LANGUAGE;
+        _needBuffering=0;
   }
   /* Index in mkv */
   uint32_t  streamIndex;
@@ -83,10 +84,35 @@
   uint32_t  _sizeInBytes; // Approximate size in bytes of that stream
   uint32_t  _defaultFrameDuration; // Duration of ONE frame in us!
   std::string language;
+  int       _needBuffering;
 };
 
 #define MKV_MAX_LACES 101 // ?
 /**
+ */
+class mkvAccess;
+class mkvAccessBuffered : public ADM_audioAccess
+{
+public:
+            mkvAccessBuffered(mkvAccess *ac,int maxSize);
+            ~mkvAccessBuffered();
+                virtual bool      isCBR(void) { return false;}
+                virtual bool      canSeekTime(void) {return true;};
+                virtual bool      canSeekOffset(void) {return false;};
+                virtual bool      canGetDuration(void) {return true;};
+                virtual uint64_t  getDurationInUs(void);
+                virtual bool      goToTime(uint64_t timeUs);
+                virtual bool      getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,uint64_t *dts);
+                virtual bool      getExtraData(uint32_t *l, uint8_t **d);  
+protected:
+            mkvAccess   *_son;
+            int         _maxSize;
+            uint8_t     *_buffer;
+            int         _inBuffer;
+            int         _offset;
+};
+
+/**
     \class mkvAccess
     \brief Matroska audio demuxer
 */
@@ -105,9 +131,14 @@
 
     uint8_t                     goToBlock(uint32_t x);
     bool                        initLaces(uint32_t nbLaces,uint64_t time);
-     int              readAndRepeat(uint8_t *buffer, uint32_t len)
+     int              readAndRepeat(uint8_t *buffer, uint32_t len, uint32_t max)
                         {
                              uint32_t rpt=_track->headerRepeatSize;
+                             if(rpt+len>max)
+                               {
+                                 ADM_error("Overflow in reading  mkv audio : %u (%u) max was %d\n",rpt+len,rpt,max);
+                                 ADM_assert(0);
+                               }
                               _parser->readBin(buffer+rpt,len);
                               if(rpt)
                                 memcpy(buffer,_track->headerRepeat,rpt);
@@ -145,7 +176,7 @@
 {
   protected:
     uint64_t                 _timeBase;  // Time base in us, default is 1000=1 ms
-    mkvAccess               **_access;
+    ADM_audioAccess         **_access;
     ADM_audioStream         **_audioStreams;
     ADM_ebml_file           *_parser;
     char                    *_filename;
@@ -171,6 +202,8 @@
     int                     searchTrackFromTid(uint32_t tid);
     bool                    readSeekHead(ADM_ebml_file *body);
     //
+    //                      
+    int                     isBufferingNeeded(mkvTrak *trk); // Split audio blocks into smaller pieces if needed
     uint8_t                 reformatVorbisHeader(mkvTrak *trk);
     // Indexers

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvAccessBuffered.cpp Added

@@ -0,0 +1,107 @@
+/***************************************************************************
+    copyright            : (C) 2006 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_cpp.h"
+#include "ADM_default.h"
+#include "math.h"
+#include "ADM_Video.h"
+
+#include "ADM_mkv.h"
+#include "ADM_a52info.h"
+#include "ADM_dcainfo.h"
+
+#include "ADM_vidMisc.h"
+#if 0
+#define aprintf ADM_info
+#else
+#define aprintf(...) {}
+#endif
+
+/**
+    \fn mkvAccess
+    \brief constructor
+
+*/
+mkvAccessBuffered::mkvAccessBuffered(mkvAccess *access, int maxSize)
+{
+    _maxSize=maxSize;
+    _son=access;
+    _buffer=new uint8_t[maxSize];
+    _inBuffer=0;
+    _offset=0;
+}
+
+mkvAccessBuffered::~mkvAccessBuffered()
+{
+    if(_buffer) delete [] _buffer;
+    if(_son) delete  _son;
+    _buffer=NULL;
+    _son=NULL;
+}
+bool      mkvAccessBuffered::getExtraData(uint32_t *l, uint8_t **d)
+{
+    return _son->getExtraData(l,d);
+}
+/**
+    \fn getDurationInUs
+*/
+uint64_t  mkvAccessBuffered::getDurationInUs(void)
+{
+    return _son->getDurationInUs();
+}
+
+/**
+    \fn goToTime
+*/
+bool      mkvAccessBuffered::goToTime(uint64_t timeUs)
+{
+    _inBuffer=_offset=0;
+    return _son->goToTime(timeUs);
+}
+/**
+    \fn getPacket
+*/
+bool    mkvAccessBuffered::getPacket(uint8_t *dest, uint32_t *packLen, uint32_t maxSize,uint64_t *timecode)
+{
+    if(_offset==_inBuffer)
+    {
+        _offset=_inBuffer=0;
+    }
+    if(!_inBuffer)
+    {
+        uint32_t len=0;
+        if(!_son->getPacket(_buffer,&len,_maxSize,timecode))
+        {
+            return false;
+        }
+        _inBuffer=len;
+        int rnd=_inBuffer;
+        if(rnd>maxSize) rnd=maxSize;
+        memcpy(dest,_buffer,rnd);
+        _offset=rnd;
+        *packLen=rnd;
+        aprintf("New block size=%d, time=%s\n",rnd,ADM_us2plain(*timecode));
+        return true;
+    }
+    // flush buffer
+    int rnd=_inBuffer-_offset;
+    if(rnd>maxSize) rnd=maxSize;
+    memcpy(dest,_buffer+_offset,rnd);
+    _offset+=rnd;
+    *timecode=ADM_NO_PTS;
+    *packLen=rnd;
+    aprintf("old block size=%d, time=%s\n",rnd,ADM_us2plain(*timecode));
+    return true;
+   
+}
+//EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp Changed

@@ -24,7 +24,7 @@
 #include "ADM_mkv.h"
 
 #include "mkv_tags.h"
-
+#include "ADM_aacinfo.h"
 class entryDesc
 {
   public:
@@ -190,7 +190,7 @@
           printf("[MKV] No duration, assuming 25 fps\n");
           _videostream.dwScale=1000;
           _videostream.dwRate=25000;
-          _tracks[0]._defaultFrameDuration=25000;
+          _tracks[0]._defaultFrameDuration=40000;
 
         }
 
@@ -281,13 +281,36 @@
             }
         }
         //**
-                  if(entry.fcc==WAV_AAC && !entry.extraDataLen)
-                  {
-                      ADM_info("Recreating aac extradata..\n");
-                      entry.extraData = new uint8_t[5];
-                      createAACExtraData(entry.codecId.c_str(),&entry);
-                  }
-        
+        if(entry.fcc==WAV_AAC)
+        {
+            if(!entry.extraDataLen)
+            {
+                ADM_info("Recreating aac extradata..\n");
+                entry.extraData = new uint8_t[5];
+                createAACExtraData(entry.codecId.c_str(),&entry);
+            }else
+            {
+                // check AAC infoata
+                 AacAudioInfo info;
+                if(ADM_getAacInfoFromConfig(entry.extraDataLen,entry.extraData,info))
+                {
+                    ADM_info("Decoding AAC extra data gives :\n");
+                    ADM_info("Fq= %d\n",info.frequency);
+                    ADM_info("channels= %d\n",info.channels);
+                    ADM_info("SBR= %d\n",info.sbr);
+                    entry.chan=info.channels;
+                    if(info.sbr)
+                    {
+                        entry.fq=info.frequency*2;
+                    }
+                    else
+                    {
+                        entry.fq=info.frequency;
+                    }
+                }
+                 
+            }
+        }
         //**
          t->language=entry.language;
          t->wavHeader.encoding=entry.fcc;
@@ -396,7 +419,16 @@
                  father.readString(s,len);
                  if(!strlen(s))
                      strcpy(s,"eng"); // english is default
-                 ADM_info("Found language  = %s\n",s);
+                 if(!strcmp(s,"unknown")) // we were using "unknown", which is not a valid ISO 639 code
+                 {
+                     memset(s,'\0',100);
+                     std::string und=ADM_UNKNOWN_LANGUAGE;
+                     strcpy(s,und.c_str());
+                     ADM_info("Found 'unknown' as language code, replacing it with '%s'\n",und.c_str());
+                 }else
+                 {
+                     ADM_info("Found language  = %s\n",s);
+                 }
                  entry->language=std::string(s);
                 }
             break;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp Changed

@@ -160,7 +160,7 @@
 ADM_info("[MKVAUDIO] Asked for %s , go to block %d\n",ADM_us2plain(timeUs),clus);
 ADM_info("[MKVAUDIO] This block starts at %s\n",ADM_us2plain((*dex)[clus].Dts));
 targetUs-=(*dex)[clus].Dts; // now the time is relative
- ADM_info("[MKVAUDIO] Offset=%" PRIu64" us\n",targetUs);
+ ADM_info("[MKVAUDIO] Offset=%" PRId64" us\n",(int64_t)targetUs);
 goToBlock(clus);
 
 
@@ -226,7 +226,7 @@
 // Have we still lace to go ?
 if(_currentLace<_maxLace)
 {
- *packlen= readAndRepeat(dest, _Laces[_currentLace]);
+ *packlen= readAndRepeat(dest, _Laces[_currentLace],maxSize);
 ADM_assert(*packlen<maxSize);
 vprintf("Continuing lacing : %u bytes, lacing %u/%u\n",*packlen,_currentLace,_maxLace);
 *timecode=_lastDtsBase+_laceIncrementUs*_currentLace;
@@ -254,7 +254,7 @@
 case 0 : // no lacing
 
 vprintf("No lacing :%d bytes\n",(int)size);
- *packlen= readAndRepeat(dest,size); 
+ *packlen= readAndRepeat(dest,size,maxSize); 
 _currentLace=_maxLace=0;
 _currentBlock++;
 return 1;
@@ -279,7 +279,7 @@
 }
 
 // The first one has Dts
- *packlen= readAndRepeat(dest, _Laces[0]); 
+ *packlen= readAndRepeat(dest, _Laces[0],maxSize); 
 _Laces[nbLaces-1]=size;
 
 initLaces(nbLaces,time);
@@ -298,7 +298,7 @@
 {
 _Laces[i]=bsize;
 }
- *packlen= readAndRepeat(dest, bsize); 
+ *packlen= readAndRepeat(dest, bsize,maxSize); 
 // The first one has Dts
 initLaces(nbLaces,time);
 
@@ -336,7 +336,7 @@
 _Laces[nbLaces-1]=consumed-sum;
 
 // Take the 1st laces, it has timestamp
- *packlen= readAndRepeat(dest, _Laces[0]); 
+ *packlen= readAndRepeat(dest, _Laces[0],maxSize); 
 ADM_assert(*packlen<maxSize);
 vprintf("Continuing lacing : dts : %lu %u bytes, lacing %u/%u\n",time,*packlen,_currentLace,_maxLace);
 initLaces(nbLaces,time);

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp Changed

@@ -340,6 +340,7 @@
   if(tell()>(_begin+_size-2)) return 1;
   return 0;
 }
+
 /**
   \fn find
   \brief Search for the tag given and returns the corresponding atom
@@ -381,19 +382,53 @@
   \fn find
   \brief Search for the tag given and returns the corresponding atom
 */
-bool ADM_ebml_file::simplefind(MKV_ELEM_ID  prim,uint64_t *len,bool rewind)
+ bool ADM_ebml_file::findContainerOfSecondary(MKV_ELEM_ID  prim,MKV_ELEM_ID second,bool rewind, uint64_t *xpos, int *xheaderLen,uint64_t *xlen)
 {
-  uint64_t id,alen;
+  uint64_t id,pos;
   ADM_MKV_TYPE type;
   const char *ss;
 
+    vprintf("[MKV]Searching for tag %llx %llx\n",prim,second);
+    if(rewind) seek(_begin);
+    vprintf("[MKV]Searching primary : %llx\n",prim);
+    if(!simplefind(prim,xlen,rewind))
+    {
+      vprintf("[MKV] Primary find failed for %llx\n",prim);
+      return 0;
+    }
+    // Now we have the father, go inside
+    ADM_ebml_file *son=new ADM_ebml_file(this,*xlen);
+    vprintf("[MKV]Searching secondary : %llx\n",second);
+    if(!son->simpleFindContainerOf(second,false,xpos,xheaderLen,xlen))
+    {
+      vprintf("[MKV] secondary find failed for secondary %llx\n",second);
+      delete son;
+      return false;
+    }
+    pos=son->tell();
+    delete son;
+    seek(pos);
+    return true;
+}
+/**
+  \fn find
+  \brief Search for the tag given and returns the corresponding atom
+*/
+bool ADM_ebml_file::simpleFindContainerOf(MKV_ELEM_ID  prim,bool rewind,uint64_t *xpos,int *xheaderLen,uint64_t *xlen)
+{
+  uint64_t id,alen;
+  ADM_MKV_TYPE type;
+  const char *ss;
+  uint64_t pos;
 
     vprintf("[MKV] Simple Searching for tag %llx\n",prim);
-    if(rewind) seek(_begin);
+    if(rewind) 
+        seek(_begin);
 
       while(!finished())
       {
           //printf("Offset is %d\n",(int)(this->tell()>>10));
+          pos=this->tell();
           readElemId(&id,&alen);
           if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
           {
@@ -409,13 +444,27 @@
           vprintf("Found Tag : %x (%s)\n",id,ss);
           if(id==prim)
           {
-            *len=alen;
-            return 1;
+            *xpos=pos;
+            *xheaderLen=this->tell()-pos;
+            *xlen=alen;
+            return true;
           }else
             skip(alen);
       }
     vprintf("[MKV] Failed to locate %llx\n",prim);
-    return 0;
+    return false;
+}
+/**
+  \fn find
+  \brief Search for the tag given and returns the corresponding atom
+*/
+bool ADM_ebml_file::simplefind(MKV_ELEM_ID  prim,uint64_t *len,bool rewind)
+{
+  uint64_t pos;
+  int headerLen;  
+  bool r= simpleFindContainerOf( prim,rewind,&pos,&headerLen,len)  ;
+  
+  return r;
 }
 /**
     \fn remaining

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp Changed

@@ -88,6 +88,7 @@
 nbIndex=0;
 id=0;
 memset(&_rdWav,0,sizeof(_rdWav));
+ delay=0;
 
 }
 MP4Track::~MP4Track()
@@ -513,18 +514,30 @@
 fseeko(_fd,0,SEEK_SET);
 refineFps();
 uint64_t duration1=_movieDuration*1000LL;
- uint64_t duration2=_tracks[0].index[nb-1].pts;
- 
- ADM_info("3gp/mov file successfully read..\n");
- if(duration2!=ADM_NO_PTS && duration2>duration1)
+ uint64_t duration2=0;
+ uint32_t lastFrame=0;
+ for(int i=nb-32;i<nb;i++)
 {
- ADM_warning("Last PTS is after movie duration, increasing movie duration\n");
- _movieDuration=(_tracks[0].index[nb-1].pts/1000)+1;
+ if(i<0) continue;
+ if(_tracks[0].index[i].pts==ADM_NO_PTS) continue;
+ if(duration2<_tracks[0].index[i].pts)
+ {
+ duration2=_tracks[0].index[i].pts;
+ lastFrame=i;
+ }
 }
- ADM_info("Nb images : %d\n",nb);
- ADM_info("Movie duration : %s\n",ADM_us2plain(_movieDuration*1000LL));
- ADM_info("Last video PTS : %s\n",ADM_us2plain(_tracks[0].index[nb-1].pts));
- ADM_info("Last video DTS : %s\n",ADM_us2plain(_tracks[0].index[nb-1].dts));
+ ADM_info("3gp/mov file successfully read..\n");
+ if(duration2!=ADM_NO_PTS && duration2>=duration1)
+ { // video duration must be > max PTS, otherwise we drop the last frame
+ ADM_warning("Last PTS is at or after movie duration, increasing movie duration\n");
+ _movieDuration=(duration2/1000)+1;
+ }
+ if(nb>1 && !lastFrame)
+ lastFrame=nb-1;
+ ADM_info("Nb images : %d\n",nb);
+ ADM_info("Movie duration : %s\n",ADM_us2plain(_movieDuration*1000LL));
+ ADM_info("Last video PTS : %s\n",ADM_us2plain(_tracks[0].index[lastFrame].pts));
+ ADM_info("Last video DTS : %s\n",ADM_us2plain(_tracks[0].index[nb-1].dts));
 
 checkDuplicatedPts();
 
@@ -559,13 +572,29 @@
 */
 bool MP4Header::adjustElstDelay()
 {
- if(this->delayRelativeToVideo)
+ int xmin=10000000;
+ int xscaledDelay[_3GP_MAX_TRACKS];
+ for(int i=0;i<1+nbAudioTrack;i++)
 {
- ADM_info("Compensating for a/v delay\n");
- shiftAudioTimeBy(this->delayRelativeToVideo);
+ double scaledDelay=_tracks[i].delay;
+ scaledDelay=scaledDelay/(double)_tracks[i].scale;
+ scaledDelay*=1000000;
+ xscaledDelay[i]=scaledDelay;
+ ADM_info("Delay for track %d : raw = %d, scaled = %d with scale=%d\n",i,_tracks[i].delay,xscaledDelay[i],_tracks[i].scale);
+ if(scaledDelay<xmin)
+ xmin=scaledDelay;
+ }
+ ADM_info("Elst minimum = %d us\n",xmin);
+ for(int i=0;i<1+nbAudioTrack;i++)
+ {
+ int d=xscaledDelay[i]-xmin;
+ if(d)
+ {
+ ADM_info(" Shifting track %d by %s\n",d,ADM_us2plain(d));
+ shiftTrackByTime(i,d);
+ }
 }
 return true;
-
 }
 
 
@@ -589,25 +618,37 @@
 pts+=shift;
 VDEO.index[i].pts=pts;
 }
-
- shiftAudioTimeBy(shift);
+ for(int i=1;i<nbAudioTrack;i++) 
+ shiftTrackByTime(i,shift);
 return true; 
 }
-bool MP4Header::shiftAudioTimeBy(uint64_t shift)
+/**
+ * 
+ * @param dex
+ * @param shift
+ * @return 
+ */
+bool MP4Header::shiftTrackByTime(int dex,uint64_t shift)
 {
- int nb;
- for(int audioTrack=0;audioTrack<nbAudioTrack;audioTrack++)
- {
- nb=(int)_tracks[1+audioTrack].nbIndex;
- for(int i=0;i<nb;i++)
- {
- uint64_t dts;
- dts=_tracks[audioTrack+1].index[i].dts;
- if(dts==ADM_COMPRESSED_NO_PTS) continue;
- dts+=shift;
- _tracks[audioTrack+1].index[i].dts=dts;
- }
- }
+ int nb=(int)_tracks[dex].nbIndex;
+ MP4Index *myIndex=_tracks[dex].index;
+ for(int i=0;i<nb;i++)
+ {
+ uint64_t dts,pts;
+ dts=myIndex[i].dts;
+ pts=myIndex[i].pts;
+ if(dts!=ADM_COMPRESSED_NO_PTS)
+ {
+ dts+=shift;
+ }
+ if(pts!=ADM_COMPRESSED_NO_PTS)
+ {
+ pts+=shift;
+ }
+ myIndex[i].dts=dts;
+ myIndex[i].pts=pts;
+ }
+
 return true;
 }

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h Changed

@@ -67,7 +67,7 @@
 */
 class MP4Track
 {
-public:
+public: 
 MP4Index *index;
 uint32_t id;
 uint32_t scale;
@@ -75,6 +75,7 @@
 uint32_t extraDataSize;
 uint8_t *extraData;
 WAVHeader _rdWav;
+ uint64_t delay;
 std::vector <mp4Fragment> fragments;
 MP4Track(void);
 ~MP4Track();
@@ -185,7 +186,7 @@
 uint8_t lookupMainAtoms(void *tom);
 void parseMvhd(void *tom);
 uint8_t parseTrack(void *ztom);
- uint8_t parseElst(void *tom,uint32_t trackType);
+ int64_t parseElst(void *tom);
 bool parseMoof(adm_atom &son);
 bool parseTraf(adm_atom &son,uint64_t moofStart);
 int lookupIndex(int desc) ;
@@ -199,6 +200,7 @@
 bool refineFps(void);
 bool adjustElstDelay(void);
 uint32_t _videoScale;
+ uint32_t _movieScale;
 int64_t			_movieDuration; // in ms
 uint32_t _videoFound;
 bool processAudio( MP4Track *track, uint32_t trackScale, 
@@ -217,6 +219,7 @@
 MP4Track _tracks[_3GP_MAX_TRACKS];
 int64_t _audioDuration;
 uint32_t _currentAudioTrack;
+ int64_t _currentDelay;
 Mp4Flavor _flavor;
 uint8_t parseAtomTree(adm_atom *atom);
 ADM_mp4AudioAccess *audioAccess[_3GP_MAX_TRACKS-1];
@@ -224,7 +227,7 @@
 uint32_t nbAudioTrack;
 bool refineAudio(WAVHeader *head,uint32_t extraLen, uint8_t *extra);
 bool shiftTimeBy(uint64_t shift);
- bool shiftAudioTimeBy(uint64_t shift);
+ bool shiftTrackByTime(int dex,uint64_t shift);
 bool checkDuplicatedPts(void);
 /*********************************/
 	uint32_t readPackedLen(adm_atom *tom );

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

@@ -94,7 +94,7 @@
 bool success=true;
 ADMAtoms id;
 uint32_t container;
- printf("Analyzing file and atoms\n");
+ ADM_info("Analyzing file and atoms\n");
 
 if(!ADM_mp4SimpleSearchAtom(tom, ADM_MP4_MOOV,&moov))
 {
@@ -117,7 +117,7 @@
 case ADM_MP4_TRACK:
 if(!parseTrack(&son))
 {
- printf("Parse Track failed\n");
+ ADM_info("Parse Track failed\n");
 success=false;
 } ;
 break;
@@ -156,7 +156,7 @@
 }
 }
 
- printf("Done finding main atoms\n");
+ ADM_info("Done finding main atoms\n");
 return success;
 }
 /**
@@ -178,20 +178,21 @@
 int scale = tom->read32();
 uint64_t duration = (version == 1) ? tom->read64() : tom->read32();
 
- _videoScale = scale;
+ _movieScale = scale;
 
- printf("Warning: scale is not in ms %" PRIu32"!\n", _videoScale);
+ ADM_info("Warning: movie scale is %d\n", (int)_movieScale);
 
- if (_videoScale)
+ if (_movieScale)
 {
 duration = 1000 * duration; // In ms
- duration /= _videoScale;
+ duration /= _movieScale;
 }
 else
- _videoScale = 1000;
+ _movieScale = 1000;
 
 //printf("Movie duration: %s\n", ms2timedisplay(duration));
-
+ _videoScale=_movieScale;
+ _tracks[0].scale=_videoScale;
 _movieDuration = duration;
 }
 
@@ -206,8 +207,8 @@
 uint32_t container;
 uint32_t w,h;
 uint32_t trackType=TRACK_OTHER;
-
- printf("Parsing Track\n");
+ _currentDelay=0;
+ ADM_info("Parsing Track\n");
 while(!tom->isDone())
 {
 adm_atom son(tom);
@@ -279,7 +280,7 @@
 uint64_t trackDuration;
 *trackType=TRACK_OTHER;
 uint8_t r=0;
- printf("<<Parsing Mdia>>\n");
+ ADM_info("<<Parsing Mdia>>\n");
 while(!tom->isDone())
 {
 adm_atom son(tom);
@@ -331,17 +332,20 @@
 {
 default:
 *trackType=TRACK_OTHER;
- printf("Found other type track\n");
+ ADM_info("Found other type track\n");
 break;
 case MKFCCR('v','i','d','e')://'vide':
 *trackType=TRACK_VIDEO;
- printf("hdlr video found \n ");
+ _tracks[0].delay=_currentDelay;
+ ADM_info("hdlr video found \n ");
 _movieDuration=trackDuration;
 _videoScale=trackScale;
+ _tracks[0].scale=_videoScale;
 break;
 case MKFCCR('s','o','u','n'): //'soun':
+ _tracks[1+nbAudioTrack].delay=_currentDelay;
 *trackType=TRACK_AUDIO;
- printf("hdlr audio found \n ");
+ ADM_info("hdlr audio found \n ");
 break;
 case MKFCCR('u','r','l',' ')://'url ':
 {
@@ -353,7 +357,7 @@
 char *str=new char[s+1];
 son.readPayload((uint8_t *)str,s);
 str[s]=0;
- printf("Url : <%s>\n",str);
+ ADM_info("Url : <%s>\n",str);
 delete [] str;
 }
 break;
@@ -378,7 +382,7 @@
 {
 if(! parseStbl(&grandson,*trackType, w, h,trackScale))
 {
- printf("STBL failed\n");
+ ADM_info("STBL failed\n");
 return 0;
 }
 r=1;
@@ -402,34 +406,54 @@
 * @param tom
 * @return 
 */
-uint8_t MP4Header::parseElst(void *ztom,uint32_t trackType)
+int64_t MP4Header::parseElst(void *ztom)
 {
- uint32_t editDuration;
- uint32_t mediaTime;
 uint32_t playbackSpeed;
 adm_atom *tom=(adm_atom *)ztom;
- tom->skipBytes(4);
+ int version=tom->read();
+ tom->skipBytes(3);
 uint32_t nb=tom->read32();
- ADM_info("Found %" PRIu32" entries in list:\n",nb);
+ int64_t *editDuration=new int64_t[nb];
+ int64_t *mediaTime=new int64_t[nb];
+ int64_t delay=0;
+ 
+ ADM_info("[ELST] Found %" PRIu32" entries in list, version=%d\n",nb,version);
 for(int i=0;i<nb;i++)
- {
- editDuration=tom->read32();
- mediaTime=tom->read32();
+ {
+ if(1==version)
+ {
+ editDuration[i]=(int64_t)tom->read64();
+ mediaTime[i]=(int64_t)tom->read64();
+ }else
+ {
+ editDuration[i]=(int32_t)tom->read32();
+ mediaTime[i]=(int32_t)tom->read32();
+ }
 playbackSpeed=tom->read32();
- ADM_info("Duration : %" PRIu32", mediaTime:%" PRIu32" speed=%" PRIu32"\n",editDuration,mediaTime,playbackSpeed);
- } 
- if(trackType==TRACK_VIDEO && nb==1 && mediaTime>0 && _videoScale )
- {
- ADM_info("** Audio Tracks need to be delayed , %d vs trackscale %d \n",(int)mediaTime,(int)_videoScale);
- double d=mediaTime;
- d/=_videoScale;
- d*=1000000.;
- delayRelativeToVideo=(uint64_t)d;
- ADM_info("** Computed delay =%s \n",ADM_us2plain(delayRelativeToVideo));
- 
- 
- }
- return 1;
+ ADM_info("Duration : %d, mediaTime:%d speed=%d \n",(int)editDuration[i],(int)mediaTime[i],(int)playbackSpeed);
+ } 
+ 
+ switch(nb)
+ {
+ case 1:
+ if(mediaTime[0]>0)
+ delay=mediaTime[0];
+ break;
+ case 2:
+ if(mediaTime[0]==-1)
+ {
+ delay=editDuration[0];
+ }
+ break;
+ default:
+ break; 
+ }
+ // Nb : The unit is movie timescale
+ ADM_info("** Computed delay =%d\n",delay);
+ 
+ delete [] editDuration;
+ delete [] mediaTime;
+ return delay;
 }
 /**
 \fn parseEdts
@@ -441,7 +465,7 @@
 ADMAtoms id;
 uint32_t container;
 
- ADM_info("Parsing Edts>>\n");
+ ADM_info("Parsing Edts, trackType=%d\n",trackType);
 while(!tom->isDone())
 {
 adm_atom son(tom);
@@ -456,7 +480,7 @@
 case ADM_MP4_ELST:
 {
 ADM_info("ELST atom found\n");
- parseElst(&son,trackType);
+ _currentDelay=parseElst(&son);
 son.skipAtom();
 break;
 
@@ -485,7 +509,7 @@
 memset(&info,0,sizeof(info));
 
 
- printf("<<Parsing Stbl>>\n");
+ ADM_info("<<Parsing Stbl>>\n");
 while(!tom->isDone())
 {
 adm_atom son(tom);
@@ -501,7 +525,7 @@
 {
 son.read32();
 info.nbSync=son.read32();
- printf("Stss:%u\n",info.nbSync);
+ ADM_info("Stss:%u\n",info.nbSync);
 if(info.nbSync)
 {
 info.Sync=new uint32_t[info.nbSync];
@@ -515,10 +539,10 @@
 }
 case ADM_MP4_STTS:
 {
- printf("stts:%" PRIu32"\n",son.read32()); // version & flags
+ ADM_info("stts:%" PRIu32"\n",son.read32()); // version & flags
 info.nbStts=son.read32();
- printf("Time stts atom found (%" PRIu32")\n",info.nbStts);
- printf("Using myscale %" PRIu32"\n",trackScale);
+ ADM_info("Time stts atom found (%" PRIu32")\n",info.nbStts);
+ ADM_info("Using myscale %" PRIu32"\n",trackScale);
 info.SttsN=new uint32_t[info.nbStts];
 info.SttsC=new uint32_t[info.nbStts];
 //double dur;
@@ -557,7 +581,7 @@
 n=son.read32();
 info.nbSz=son.read32();
 info.SzIndentical=0;
- printf("%" PRIu32" frames /%" PRIu32" nbsz..\n",n,info.nbSz);
+ ADM_info("%" PRIu32" frames /%" PRIu32" nbsz..\n",n,info.nbSz);
 if(n)
 {
 aprintf("\t\t%" PRIu32" frames of the same size %" PRIu32" , n=%" PRIu32"\n",
@@ -579,7 +603,7 @@
 {
 uint32_t n,i,j,k,v;
 
- printf("ctts:%" PRIu32"\n",son.read32()); // version & flags
+ ADM_info("ctts:%" PRIu32"\n",son.read32()); // version & flags
 n=son.read32();
 if(n==1) // all the same , ignore
 {
@@ -617,10 +641,10 @@
 {
 delete [] info.Ctts;
 info.Ctts=NULL;
- printf("Destroying Ctts, seems invalid\n");
+ ADM_info("Destroying Ctts, seems invalid\n");
 }
 ADM_assert(info.nbCtts<sum+1);
- printf("Found %u elements\n",info.nbCtts);
+ ADM_info("Found %u elements\n",info.nbCtts);
 }
 break;
 case ADM_MP4_STCO:
@@ -628,7 +652,7 @@
 son.skipBytes(4);
 
 info.nbCo = son.read32();
- printf("\t\tnbCo: %u\n", info.nbCo);
+ ADM_info("\t\tnbCo: %u\n", info.nbCo);
 
 info.Co = new uint64_t[info.nbCo];
 
@@ -644,7 +668,7 @@
 son.skipBytes(4);
 
 info.nbCo = son.read32();
- printf("\t\tnbCo: %u\n", info.nbCo);
+ ADM_info("\t\tnbCo: %u\n", info.nbCo);
 
 info.Co = new uint64_t[info.nbCo];
 
@@ -669,8 +693,8 @@
 if(i || (trackType==TRACK_VIDEO && _videoFound) || (trackType==TRACK_OTHER))
 {
 son.skipBytes(left);
- printf("[STSD] ignoring %s, size %u\n",fourCC::tostringBE(entryName),entrySize);
- if(trackType==TRACK_OTHER) printf("[STSD] because track=other\n");
+ ADM_info("[STSD] ignoring %s, size %u\n",fourCC::tostringBE(entryName),entrySize);
+ if(trackType==TRACK_OTHER) ADM_info("[STSD] because track=other\n");
 continue;
 }
 switch(trackType)
@@ -678,7 +702,7 @@
 case TRACK_VIDEO:
 {
 uint32_t lw=0,lh=0;
- printf("[STSD] VIDEO %s, size %u\n",fourCC::tostringBE(entryName),entrySize);
+ ADM_info("[STSD] VIDEO %s, size %u\n",fourCC::tostringBE(entryName),entrySize);
 son.skipBytes(8); // reserved etc..
 left-=8;
 son.read32(); // version/revision
@@ -1251,7 +1275,7 @@
 }
 #endif
 r=indexify(&(_tracks[1+nbAudioTrack]),trackScale,&info,1,&nbo);
- printf("Indexed audio, nb blocks:%u\n",nbo);
+ ADM_info("Indexed audio, nb blocks:%u\n",nbo);
 if(r)
 {
 nbo=_tracks[1+nbAudioTrack].nbIndex;
@@ -1259,7 +1283,7 @@
 _tracks[1+nbAudioTrack].nbIndex=nbo;
 else
 _tracks[1+nbAudioTrack].nbIndex=info.nbSz;
- printf("Indexed audio, nb blocks:%u (final)\n",_tracks[1+nbAudioTrack].nbIndex);
+ ADM_info("Indexed audio, nb blocks:%u (final)\n",_tracks[1+nbAudioTrack].nbIndex);
 _tracks[1+nbAudioTrack].scale=trackScale;
 nbAudioTrack++;
 }

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp Changed

@@ -105,7 +105,7 @@
 uint32_t total=0;
 for(int i=0;i<track->nbIndex;i++)
 total+=track->index[i].size;
- printf("After split, we have %u bytes across %d blocks\n",total,w);
+ ADM_info("After split, we have %u bytes across %d blocks\n",total,w);
 
 return true;
 }
@@ -127,13 +127,13 @@
 uint32_t totalBytes=info->SzIndentical*info->nbSz;
 uint32_t totalSamples=0;
 double skewFactor=1;
- printf("All the same size: %u (total size %u bytes)\n",info->SzIndentical,totalBytes);
- printf("Byte per frame =%d\n",(int)info->bytePerFrame);
- printf("SttsC[0] = %d, sttsN[0]=%d\n",info->SttsC[0],info->SttsN[0]);
+ ADM_info("All the same size: %u (total size %u 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]);
 
 if(info->nbStts!=1) 
 {
- printf("WARNING: Same size, different duration\n");
+ ADM_info("WARNING: Same size, different duration\n");
 return 1;
 }
 
@@ -162,8 +162,8 @@
 total+=samplePerChunk[i];
 }
 
- printf("Total size in sample : %u\n",total);
- printf("Sample size : %u\n",info->SzIndentical);
+ ADM_info("Total size in sample : %u\n",total);
+ ADM_info("Sample size : %u\n",info->SzIndentical);
 
 if(info->SttsN[0]!=total)
 {
@@ -203,7 +203,7 @@
 free(samplePerChunk);
 if(info->nbCo)
 track->index[0].pts=0;
- printf("Found %u bytes, spread over %d blocks\n",totalBytes,info->nbCo);
+ ADM_info("Found %u bytes, spread over %d blocks\n",totalBytes,info->nbCo);
 //
 // split large chunk into smaller ones if needed
 splitAudio(track,info, trackScale);
@@ -228,8 +228,8 @@
 }
 if(info->bytePerPacket!=info->samplePerPacket)
 {
- printf("xx Byte per packet =%d\n",info->bytePerPacket);
- printf("xx Sample per packet =%d\n",info->samplePerPacket);
+ ADM_info("xx Byte per packet =%d\n",info->bytePerPacket);
+ ADM_info("xx Sample per packet =%d\n",info->samplePerPacket);
 }
 for(int i=0;i< track->nbIndex;i++)
 { 
@@ -246,7 +246,7 @@
 aprintf("Block %d, size=%d, dts=%d\n",i,track->index[i].size,track->index[i].dts);
 }
 // track->index[0].dts=0;
- printf("Index done (sample same size)\n");
+ ADM_info("Index done (sample same size)\n");
 return 1;
 }
 /**
@@ -322,6 +322,7 @@
 aprintf("# of chunks %d, max # of samples %d\n",info->nbCo, totalchunk);
 
 uint32_t *chunkCount = new uint32_t[totalchunk+1];
+#if 0
 	for(i=0;i<info->nbSc;i++)
 	{
 		for(j=info->Sc[i]-1;j<info->nbCo;j++)
@@ -331,10 +332,28 @@
 		}
 		aprintf("(%d) sc: %lu sn:%lu\n",i,info->Sc[i],info->Sn[i]);
 	}
-/*			for(j=0;j<nbSc;j++)
-			{
-				aprintf("\n count number : %d - %lu\n",j,Sn[j]);
-			}*/
+#else
+ 	for(i=0;i<info->nbSc-1;i++)
+	{
+ int mn=info->Sc[i]-1;
+ int mx=info->Sc[i+1]-1;
+ for(j=mn;j<mx;j++)
+ {
+ chunkCount[j]=info->Sn[i];
+ ADM_assert(j<=totalchunk);
+ }
+ aprintf("(%d) sc: %lu sn:%lu\n",i,info->Sc[i],info->Sn[i]);
+	}
+ // Last one
+ for(j=info->Sc[info->nbSc-1]-1;j<info->nbCo;j++)
+ {
+ chunkCount[j]=info->Sn[i];
+ ADM_assert(j<=totalchunk);
+ }
+ 
+ 
+#endif
+
 	// now we have for each chunk the number of sample in it
 	cur=0;
 	for(j=0;j<info->nbCo;j++)
@@ -428,7 +447,7 @@
 //GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4demuxer","No stts table"), NULL);
 return false;
 	}
- printf("Index done\n");
+ ADM_info("Index done\n");
 	return true;
 }
 /**

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp Changed

@@ -36,7 +36,6 @@
 char *idxName=(char *)malloc(strlen(name)+6);
 bool r=false;
 FP_TYPE appendType=FP_DONT_APPEND;
- uint32_t append;
 char *type;
 uint64_t startDts;
 uint32_t version=0;
@@ -67,7 +66,7 @@
 printf("[psDemux] Incorrect or not found type\n");
 goto abt;
 }
- append=index.getAsUint32("Append");
+ append=(bool)index.getAsUint32("Append");
 printf("[psDemux] Append=%" PRIu32"\n",append);
 if(append) appendType=FP_APPEND;
 if(!parser.open(name,&appendType))
@@ -216,7 +215,7 @@
 {
 if(frame>=ListOfFrames.size()) return 0;
 dmxFrame *pk=ListOfFrames[frame];
- if(frame==(lastFrame+1) && pk->type!=1)
+ if(frame==(lastFrame+1) && pk->type!=1) // the next frame, not an intra
 {
 lastFrame++;
 bool r=psPacket->read(pk->len,img->data);
@@ -228,7 +227,7 @@
 getFlags(frame,&(img->flags));
 return r;
 }
- if(pk->type==1)
+ if(pk->type==1) // an intra
 {
 if(!psPacket->seek(pk->startAt,pk->index)) return false;
 bool r=psPacket->read(pk->len,img->data);
@@ -240,10 +239,45 @@
 //printf("[>>>] %d:%02x %02x %02x %02x\n",frame,img->data[0],img->data[1],img->data[2],img->data[3]);
 lastFrame=frame;
 return r;
+ }
 
+ // a random frame: need to rewind first, then seek forward
+ uint32_t startPoint=frame;
+ while(startPoint && !ListOfFrames[startPoint]->startAt)
+ startPoint--;
+ printf("[psDemux] Wanted frame %" PRIu32", going back to frame %" PRIu32", last frame was %" PRIu32",\n",frame,startPoint,lastFrame);
+ pk=ListOfFrames[startPoint];
+ if(!psPacket->seek(pk->startAt,pk->index))
+ {
+ printf("[psDemux] Failed to rewind to frame %" PRIu32"\n",startPoint);
+ return false;
 }
- printf(" [PsDemux] lastFrame :%d this frame :%d\n",lastFrame,frame);
- return false;
+
+ // now seek forward
+ while(startPoint<frame)
+ {
+ pk=ListOfFrames[startPoint];
+ if(!psPacket->read(pk->len,img->data))
+ {
+ printf("[psDemux] Read failed for frame %" PRIu32"\n",startPoint);
+ lastFrame=0xffffffff;
+ return false;
+ }
+ startPoint++;
+ lastFrame=startPoint;
+ }
+ pk=ListOfFrames[frame];
+ lastFrame++;
+
+ bool r=psPacket->read(pk->len,img->data);
+
+ img->dataLength=pk->len;
+ img->demuxerFrameNo=frame;
+ img->demuxerDts=pk->dts;
+ img->demuxerPts=pk->pts;
+ //printf("[>>>] %d:%02x %02x %02x %02x\n",frame,img->data[0],img->data[1],img->data[2],img->data[3]);
+ getFlags(frame,&(img->flags));
+ return r;
 }
 
 /**

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp Changed

@@ -213,7 +213,7 @@
 writeSystem(file,bAppend);
 pkt=new psPacketLinearTracker(0xE0);
 
- audioTracks=psProbeAudio(file);
+ audioTracks=psProbeAudio(file,append);
 if(audioTracks)
 {
 for(int i=0;i<audioTracks->size();i++)
@@ -335,11 +335,14 @@
 
 }
 
+#define PREAMBLE qfprintf(index,"[Data]\n"); \
+ qfprintf(index,"# Warning, picture structure markers F/T/B are shifted one image to the right.\n"); \
+ qfprintf(index,"# To compensate for that, they are shifted one image to the left in readIndex.");
+
 if(!seq_found) continue;
 if(headerDumped==false)
 {
- 
- qfprintf(index,"[Data]");
+ PREAMBLE
 headerDumped=true;
 }
 if(data.state==idx_startAtGopOrSeq) 
@@ -361,8 +364,7 @@
 }
 if(headerDumped==false)
 {
- 
- qfprintf(index,"[Data]");
+ PREAMBLE
 headerDumped=true;
 }
 val=pkt->readi16();

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp Changed

@@ -35,8 +35,8 @@
 
 while(1)
 {
- if(!index->readString(2000,(uint8_t *)buffer)) return true;
- if(buffer[0]=='[') return true;
+ if(!index->readString(2000,(uint8_t *)buffer)) break;
+ if(buffer[0]=='[') break;
 if(buffer[0]==0xa || buffer[0]==0xd) continue; // blank line
 // Now split the line
 if(!strncmp(buffer,"Video ",6))
@@ -51,6 +51,29 @@
 processAudioIndex(buffer+6);
 }
 }
+
+ // Work around picture structure off-by-one
+ uint32_t nbImage=ListOfFrames.size();
+ if(nbImage>2)
+ {
+ ADM_info("Applying workaround for picture structure entries off-by-one.\n");
+ uint32_t next=0;
+ for(int i=0;i<nbImage-1;i++)
+ {
+ next=ListOfFrames[i+1]->pictureType;
+ ListOfFrames[i]->pictureType=next;
+ }
+ // We don't know the picture structure for the last image, but if it is a field,
+ // swapping top and bottom is a reasonable guess.
+ switch(next & AVI_FIELD_STRUCTURE)
+ {
+ case AVI_TOP_FIELD:
+ ListOfFrames[nbImage-1]->pictureType=AVI_FIELD_STRUCTURE+AVI_BOTTOM_FIELD; break;
+ case AVI_BOTTOM_FIELD:
+ ListOfFrames[nbImage-1]->pictureType=AVI_FIELD_STRUCTURE+AVI_TOP_FIELD; break;
+ default:break;
+ }
+ }
 return true;
 }
 /**
@@ -165,7 +188,7 @@
 }
 switch(picStruct)
 {
- default: ADM_warning("Unknown picture structure %c\n",picStruct);
+ default: frame->pictureType=0;ADM_warning("Unknown picture structure %c\n",picStruct);break;
 case 'F': frame->pictureType=AVI_FRAME_STRUCTURE;break;
 case 'T': frame->pictureType=AVI_FIELD_STRUCTURE+AVI_TOP_FIELD;break;
 case 'B': frame->pictureType=AVI_FIELD_STRUCTURE+AVI_BOTTOM_FIELD;break;
@@ -246,7 +269,7 @@
 hdr.byterate=br;
 hdr.channels=chan;
 hdr.encoding=codec;
- ADM_psAccess *access=new ADM_psAccess(name,pid,true);
+ ADM_psAccess *access=new ADM_psAccess(name,pid,append);
 ADM_psTrackDescriptor *desc=new ADM_psTrackDescriptor;
 desc->stream=NULL;
 desc->access=access;
@@ -296,4 +319,4 @@
 
 return true;
 }
-//EOF
\ No newline at end of file
+//EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp Changed

@@ -248,8 +248,9 @@
                 case unitTypeSps: mustFlush=true;;break;
                 case unitTypePic: 
                             picIndex=i;
+                            pictStruct=listOfUnits[i].imageStructure;
                             if(listOfUnits[i].imageType==1 || listOfUnits[i].imageType==4)
-                            mustFlush=true;
+                                mustFlush=true;
                             break;
                 case unitTypeSei:
                             pictStruct=listOfUnits[i].imageStructure;
@@ -335,6 +336,30 @@
         listOfUnits.push_back(myUnit);
         return true;
 }
+
+bool    TsIndexerBase::updateLastUnitStructure(int t)
+{
+    int n=listOfUnits.size();
+    if(!n)
+    {
+        ADM_error("Cannot update last pic, we have none.");
+        return false;
+    }
+    H264Unit &lastUnit=listOfUnits[n-1];
+    switch(t)
+    {
+        case 3: 
+                lastUnit.imageStructure=pictureFrame;
+                break;
+        case 1:  lastUnit.imageStructure=pictureTopField;
+                 break;
+        case 2:  lastUnit.imageStructure=pictureBottomField;
+                 break;
+        default: ADM_warning("frame type 0 met, this is illegal\n");
+    }
+    return true;
+}
+
 /********************************************************************************************/
 /********************************************************************************************/
 /********************************************************************************************/

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp Changed

@@ -77,6 +77,7 @@
 pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
 
 FP_TYPE append=FP_DONT_APPEND;
+#ifdef ASK_APPEND_SEQUENCED
 if(true==ADM_probeSequencedFile(file))
 {
 if(true==GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","There are several files with sequential file names. Should they be all loaded ?")))
@@ -84,6 +85,7 @@
 }
 if(true==bAppend)
 append=FP_APPEND;
+#endif
 writeSystem(file,bAppend);
 pkt->open(file,append);
 gui= createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
@@ -94,6 +96,9 @@
 bool keepRunning=true;
 #define likely(x) x
 #define unlikely(x) x
+ int lastStartCode=0xb3;
+
+#define REMEMBER() { lastStartCode=startCode;} 
 while(keepRunning)
 {
 startCode=pkt->findStartCode();
@@ -103,6 +108,7 @@
 {
 // B2: User Data
 case 0xB3: // sequence start
+ REMEMBER()
 if(seq_found)
 {
 decodingImage=false;
@@ -137,36 +143,49 @@
 continue;
 break;
 //#warning FIXME, update pic field info.... It triggers a end-of-pic message as it is
-#if 0
+
 case 0xB5: // extension
- { 
- uint8_t id=pkt->readi8()>>4; // +1
- uint8_t two;
- switch(id)
+ { 
+ uint8_t id=pkt->readi16()>>12; // +1
+ switch(id)
+ {
+ case 1: // Sequence extension
+ REMEMBER()
+ val=(val>>3)&1; // gop type progressive, unreliable, not used
+ break;
+ case 8: // picture coding extension (mpeg2)
+ {
+ if(lastStartCode!=0)
 {
- case 1: // Sequence extension
- val=(val>>3)&1; // gop type progressive, unreliable, not used
- break;
- case 8: // picture coding extension (mpeg2)
- {
- // skip motion vector
- uint8_t picture_structure;
- pkt->forward(1); // 4*4 bits // +1
- two=pkt->readi8(); // +1
- picture_structure=(two)&3;
- 
- //printf("Picture type %02x struct:%x\n",two,picture_structure);
- updatePicStructure(video,picture_structure);
- pkt->getInfo(&thisUnit.packetInfo);
- thisUnit.consumedSoFar=pkt->getConsumed();
- addUnit(data,unitTypePicInfo,thisUnit,4+1+1+1);
- }
- default:break;
+ ADM_warning("Picture coding extension not following picture (%x)\n",lastStartCode);
+ continue;
 }
+ REMEMBER()
+ int one, two,three;
+ one=pkt->readi8(); // +1
+ two=pkt->readi8(); // +1
+ three=pkt->readi8();
+ 
+ int picture_structure=one&3;// 1=TOP, 2=BOTTOM, 3=FRAME
+ bool tff=!!(two&0x80);;
+ bool progressive_frame=!!(three&0x80);;
+ updateLastUnitStructure(picture_structure);
+#if 0 
+ printf("structure %d progressive=%d tff=%d (%x:%x:%x)\n",picture_structure,progressive_frame,tff,one,two,three);
+
+ //printf("Picture type %02x struct:%x\n",two,picture_structure);
+ updatePicStructure(video,picture_structure);
+ pkt->getInfo(&thisUnit.packetInfo);
+ thisUnit.consumedSoFar=pkt->getConsumed();
+ addUnit(data,unitTypePicInfo,thisUnit,4+1+1+1);
+#endif 
 }
- break;
-#endif
+ default:break;
+ }
+ }
+ break;
 case 0xb8: // GOP
+ REMEMBER()
 // Update ui 
 if(!seq_found) continue;
 
@@ -174,7 +193,7 @@
 thisUnit.consumedSoFar=pkt->getConsumed();
 if(!addUnit(data,unitTypeSps,thisUnit,4))
 keepRunning=false;
- break;
+ break; 
 case 0x00 : // picture
 {
 int type;
@@ -188,6 +207,7 @@
 
 temporal_ref=val>>6;
 type=7 & (val>>3);
+ REMEMBER()
 if( type<1 || type>3)
 {
 printf("[Indexer]Met illegal pic at %" PRIx64" + %" PRIx32"\n",

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp Changed

@@ -317,9 +317,14 @@
         if(s)
         {
             language=std::string(s);
-            printf("Language=%s\n",s);
+            if(language==std::string("unknown")) // we were using "unknown", which is not a valid ISO 639 code
+            {
+                language=ADM_UNKNOWN_LANGUAGE;
+                printf("Found 'unknown' as language code, replacing it with '%s'\n",language.c_str());
+            }
+            printf("Language=%s\n",language.c_str());
         }
-        
+
         WAVHeader hdr;
             hdr.frequency=fq;
             hdr.byterate=br;
@@ -355,7 +360,8 @@
         {
             ADM_info("No extradata (%s)\n",body);
         }
-        ADM_tsAccess *access=new ADM_tsAccess(name,pid,true,(ADM_TS_MUX_TYPE)muxing,extraLen,extraData);
+        bool append=(bool)index->getAsUint32("Append");
+        ADM_tsAccess *access=new ADM_tsAccess(name,pid,append,(ADM_TS_MUX_TYPE)muxing,extraLen,extraData);
         if(extraData) delete [] extraData;
         extraData=NULL;
         ADM_tsTrackDescriptor *desc=new ADM_tsTrackDescriptor;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp Changed

@@ -155,7 +155,7 @@
 */
 bool tsPacket::getSinglePacket(uint8_t *buffer)
 {
-#define MAX_SKIPPED_PACKET 150*100 // 150*180*100=~ 2.2 MBytes
+#define MAX_SKIPPED_PACKET 300*100 // 150*180*100=~ 2.2 MBytes
 #define MAX_SEARCH 2048
 int count=0;
 again:
@@ -362,7 +362,7 @@
 #if 1
 #define zprintf(...) {}
 #else
-#define zprintf printf
+#define zprintf ADM_info
 #endif
 TSpacketInfo pkt;
 pes->fresh=false;
@@ -425,7 +425,7 @@
 goto nextPack3;
 
 //
- zprintf("[Ts Demuxer] Found PES of len %d\n",pes->payloadSize); 
+ zprintf("[Ts Demuxer] Found PES of len %d, offset=%d\n",pes->payloadSize, pes->offset); 
 pes->fresh=true;
 
 return true;
@@ -433,7 +433,7 @@
 /**
 \fn decodePesHeader
 */
-#define fail(x) {printf("[Ts Demuxer]*********" x"*******\n");return false;}
+#define fail(x) {ADM_warning("[Ts Demuxer]*********" x"*******\n");return false;}
 bool tsPacket::decodePesHeader(TS_PESpacket *pes)
 {
 uint8_t *start=pes->payload+6;
@@ -448,7 +448,7 @@
 
 if(pes->payloadSize<(4+2+1+2)) 
 {
- printf("[Ts] Pes size too small\n");
+ ADM_warning("[Ts] Pes size too small\n");
 return false;
 }
 while(*start==0xff && start<end) start++; // Padding
@@ -523,15 +523,21 @@
 {
 tail=sizeCheck-packLen;
 pes->payloadSize-=tail; 
- printf("[TS Packet]extra crap at the end %d\n",tail);
+ ADM_warning("[TS Packet]extra crap at the end %d\n",tail);
 }
 else
 if(packLen>sizeCheck)
 {
- printf("[TS Packet] PackLen=%d, avalailble=%d\n",packLen,sizeCheck);
+ ADM_warning("[TS Packet] PackLen=%d, avalailble=%d\n",packLen,sizeCheck);
 fail("Pes too long");
 } 
 }
+ zprintf("[decodePesHeader] payloadSize=%d, offset=%d \n",pes->payloadSize,pes->offset);
+ if(pes->offset>pes->payloadSize)
+ {
+ ADM_warning("[decodePesHeader] Inconsistent size, dropping\n");
+ return false;
+ }
 return true;
 }
 /**

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy_cli.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy_cli.cpp Changed

@@ -22,9 +22,17 @@
 
 #include "ADM_vsProxy.h"
 #include <math.h>
+#include <string>
 
 extern uint8_t ADM_InitMemcpy(void);
 
+static void printUsageAndExit()
+{
+ printf("vsProxy [--port PORT_TO_USE] scriptFile\n");
+ exit(-1);
+}
+
+
 #if 0
 #define aprintf printf
 #else
@@ -34,14 +42,70 @@
 */
 int main(int ac, char **av)
 {
- int port=9999;
- if(ac!=2)
+ int port = -1;
+ int vsScriptPos = -1;
+ if (ac < 2)
+ {
+ printUsageAndExit();
+ }
+ for (int avPos = 1; avPos < ac; ++avPos)
+ {
+ if (std::string("--port") == av[avPos])
+ {
+ if (++avPos == ac)
+ {
+ printf("Missing port number argument!");
+ exit(-1);
+ }
+ try
+ {
+ size_t resPos;
+ std::string strPort(av[avPos]);
+ port = std::stoi(strPort, &resPos, 0);
+ if (resPos != strPort.size())
+ {
+ throw 123;
+ }
+ }
+ catch(...)
+ {
+ printf("Invalid port number given '%s'\n", av[avPos]);
+ exit(-1);
+ }
+ if (port < 1 || port > 65535)
+ {
+ printf("Invalid port number. Must be within range [1024;65535]\n");
+ exit (-1);
+ }
+ if (port < 1024 && port > 1)
+ {
+ printf("Given port needs privilege access. This is not supported!\n");
+ exit (-1);
+ }
+ }
+ else
+ {
+ if (vsScriptPos == -1) {
+ vsScriptPos = avPos;
+ continue;
+ }
+ printf("Invalid argument '%s' found!\n", av[avPos]);
+ exit(-1);
+ }
+ }
+
+ // Missing script argument?
+ if (vsScriptPos == -1)
 {
- printf("vsProxy scriptFile\n");
- exit(-1); 
+ printUsageAndExit();
+ }
+ // Use the default parameter
+ if (port == -1) {
+ port = 9999;
 }
+
 ADM_InitMemcpy();
- 
+
 #ifdef _WIN32
 WSADATA wsaData;
 int iResult;
@@ -53,14 +117,14 @@
 printf("Error at WSAStartup()\n");
 fflush(stdout);
 exit(-1);
- }	
+ }
 ADM_info("WinSock ok\n");
 
-#endif 
- 
- 
+#endif
+
+
 vapourSynthProxy proxy;
- bool r=proxy.run(port,av[1]);
+ bool r=proxy.run(port,av[vsScriptPos]);
 if(r)
 {
 printf("Success\n");

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer_desc.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp Changed

@@ -32,7 +32,8 @@
 mkv_muxer mkvMuxerConfig=
 {
     false,  // Force
-    1280    // Display width
+    1280,   // Display width
+    0       // Display aspect ratio (any)
 };
 
 
@@ -83,16 +84,44 @@
         video_st->avg_frame_rate.num =c->time_base.den;
         c->gop_size=15;
         
-        if(true==mkvMuxerConfig.forceDisplayWidth && mkvMuxerConfig.displayWidth)
+        if((mkvMuxerConfig.forceDisplayWidth && mkvMuxerConfig.displayWidth) || mkvMuxerConfig.displayAspectRatio)
         {
+            float h=(float)(s->getHeight());
+            float w=h;
+            switch (mkvMuxerConfig.displayAspectRatio)
+            {
+                case 1:
+                    w*=4.;
+                    w/=3.;
+                    break;
+                case 2:
+                    w*=16.;
+                    w/=9.;
+                    break;
+                case 3:
+                    w*=2.;
+                    break;
+                case 4:
+                    w*=64.;
+                    w/=27.;
+                    break;
+                default:break;
+            }
+
             //sar=display/code  
             int num=1,den=1;
-            av_reduce(&num, &den, mkvMuxerConfig.displayWidth, s->getWidth(),65535);
+            if(mkvMuxerConfig.forceDisplayWidth)
+                av_reduce(&num, &den, mkvMuxerConfig.displayWidth, s->getWidth(),65535);
+            else
+                av_reduce(&num, &den, (uint32_t)w, s->getWidth(),65535);
             par->sample_aspect_ratio.num=num;
             par->sample_aspect_ratio.den=den;
             video_st->sample_aspect_ratio.num=num;
             video_st->sample_aspect_ratio.den=den;
-            ADM_info("Forcing display width of %d\n",(int)mkvMuxerConfig.displayWidth);
+            int dw=(int)w;
+            if(mkvMuxerConfig.forceDisplayWidth)
+                dw=(int)mkvMuxerConfig.displayWidth;
+            ADM_info("Forcing display width of %d (pixel aspect ratio %d:%d)\n",dw,num,den);
         }
 
         if(initAudio(nbAudioTrack,a)==false)

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp Changed

@@ -18,20 +18,29 @@
 #include "muxerMkv.h"
 #define ADM_MINIMAL_UI_INTERFACE
 #include "DIA_factory.h"
-#include "fourcc.h" 
 bool mkvConfigure(void)
 {
         bool force=mkvMuxerConfig.forceDisplayWidth;
-        uint32_t displayWidth=(uint32_t)mkvMuxerConfig.displayWidth;
+        uint32_t displayWidth=mkvMuxerConfig.displayWidth;
+        uint32_t dar=mkvMuxerConfig.displayAspectRatio;
+        if(dar)
+            force=false;
 
         diaElemToggle   alternate(&force,QT_TRANSLATE_NOOP("mkvmuxer","Force display width"));
         diaElemUInteger dWidth(&displayWidth,QT_TRANSLATE_NOOP("mkvmuxer","Display width"),16,65535);
+        diaMenuEntry    aspect[]={{OTHER,"----"},{STANDARD,"4:3"},{WIDE,"16:9"},{UNI,"18:9"},{CINEMA,"64:27"}};
+        diaElemMenu     menuAspect(&dar,QT_TRANSLATE_NOOP("mkvmuxer","Force Aspect Ratio (DAR)"),5,aspect,"");
 
-        diaElem *tabs[]={&alternate,&dWidth};
-        if( diaFactoryRun(QT_TRANSLATE_NOOP("mkvmuxer","MKV Muxer"),2,tabs))
+        alternate.link(1,&dWidth);
+        alternate.link(0,&menuAspect);
+        menuAspect.link(aspect,1,&alternate);
+
+        diaElem *tabs[]={&alternate,&dWidth,&menuAspect};
+        if( diaFactoryRun(QT_TRANSLATE_NOOP("mkvmuxer","MKV Muxer"),3,tabs))
         {
-            mkvMuxerConfig.forceDisplayWidth=(bool)force;
+            mkvMuxerConfig.forceDisplayWidth=force;
             mkvMuxerConfig.displayWidth=displayWidth;
+            mkvMuxerConfig.displayAspectRatio=dar;
             return true;
         }
         return false;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp Changed

@@ -32,7 +32,9 @@
 mp4_muxer muxerConfig=
 {
     MP4_MUXER_MP4,
-    true
+    true,
+    false,
+    WIDE
 };
 
 
@@ -100,6 +102,37 @@
         ADM_info("Video stream time base :%d,%d\n",video_st->time_base.num,video_st->time_base.den);
         c->gop_size=15;
 
+        if(true==muxerConfig.forceAspectRatio)
+        {
+            float h=(float)(s->getHeight());
+            float w=h;
+            switch (muxerConfig.aspectRatio)
+            {
+                case 0:
+                    w*=4.;
+                    w/=3.;
+                    break;
+                case 1:
+                    w*=16.;
+                    w/=9.;
+                    break;
+                case 2:
+                    w*=2.;
+                    break;
+                case 3:
+                    w*=64.;
+                    w/=27.;
+                    break;
+            }
+            int num=1,den=1;
+            av_reduce(&num, &den, (uint32_t)w, s->getWidth(),65535);
+            par->sample_aspect_ratio.num=num;
+            par->sample_aspect_ratio.den=den;
+            video_st->sample_aspect_ratio.num=num;
+            video_st->sample_aspect_ratio.den=den;
+            ADM_info("Forcing pixel aspect ratio of %d:%d\n",den,num);
+        }
+
         if(initAudio(nbAudioTrack,a)==false)
         {
             printf("[MP4] Failed to init audio\n");
@@ -132,11 +165,11 @@
 
         ADM_info("Timebase codec = %d/%d\n",c->time_base.num,c->time_base.den);
         ADM_info("Timebase stream = %d/%d\n",video_st->time_base.num,video_st->time_base.den);
+        // The reason to enforce strict CFR is unclear. Disable rounding, which may result in collisions, for now.
         if(myTimeBase.den==video_st->time_base.den && video_st->time_base.num==1)
         {
-            roundup=myTimeBase.num;
-            ADM_warning("Timebase roundup = %d\n",roundup);
-
+            //roundup=myTimeBase.num;
+            ADM_info("Timebase roundup would have been %d, ignoring\n",myTimeBase.num);
         }
         av_dict_free(&dict);
         vStream=s;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp Changed

@@ -22,16 +22,23 @@
 bool mp4Configure(void)
 {
         uint32_t fmt=(uint32_t)muxerConfig.muxerType;
+        uint32_t dar=(uint32_t)muxerConfig.aspectRatio;
         bool alt=muxerConfig.useAlternateMp3Tag;
+        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"));
+        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,"");
 
-        diaElem *tabs[]={&menuFormat,&alternate};
-        if( diaFactoryRun(QT_TRANSLATE_NOOP("mp4muxer","MP4 Muxer"),2,tabs))
+        diaElem *tabs[]={&menuFormat,&alternate,&forceAR,&menuAspect};
+        if( diaFactoryRun(QT_TRANSLATE_NOOP("mp4muxer","MP4 Muxer"),4,tabs))
         {
             muxerConfig.muxerType=(MP4_MUXER_TYPE)fmt;
             muxerConfig.useAlternateMp3Tag=alt;
+            muxerConfig.forceAspectRatio=force;
+            muxerConfig.aspectRatio=(MP4_MUXER_DAR)dar;
             return true;
         }
         return false;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp Changed

@@ -100,21 +100,53 @@
 
 int pyPrintTiming(IEditor *editor, int framenumber)
 {
-	uint32_t flags;
-	uint64_t pts, dts;
-
-	if (editor->getVideoPtsDts(framenumber, &flags, &pts, &dts))
-	{
-		int64_t delta = 0;
+    uint32_t flags;
+    uint64_t pts, dts;
 
-		if (pts != ADM_NO_PTS && dts != ADM_NO_PTS) delta = (int64_t)pts - (int64_t)dts;
-                printf("Frame  %05d",(int)framenumber);
-                printf(" Flags %04x",(int)flags);
-                printf(" DTS %s",ADM_us2plain(dts));
-                printf(" PTS %s\n",ADM_us2plain(pts));
-	}
+    if (editor->getVideoPtsDts(framenumber, &flags, &pts, &dts))
+    {
+        int64_t delta = 0;
+        if (pts != ADM_NO_PTS && dts != ADM_NO_PTS)
+            delta = (int64_t)pts - (int64_t)dts;
+        const char *frameType;
+        switch (flags & AVI_FRAME_TYPE_MASK)
+        {
+            case AVI_KEY_FRAME:
+                frameType = "I";
+                break;
+            case AVI_P_FRAME:
+                frameType = "P";
+                break;
+            case AVI_B_FRAME:
+                frameType = "B";
+                break;
+            default:
+                frameType = "?";
+                break;
+        }
+        const char *structureType;
+        switch (flags & AVI_STRUCTURE_TYPE_MASK)
+        {
+            case AVI_FIELD_STRUCTURE+AVI_TOP_FIELD:
+                structureType = "T";
+                break;
+            case AVI_FIELD_STRUCTURE+AVI_BOTTOM_FIELD:
+                structureType = "B";
+                break;
+            case AVI_FRAME_STRUCTURE:
+                structureType = "F";
+                break;
+            default:
+                structureType = "?";
+                break;
+        }
+        printf("Frame %05d",(int)framenumber);
+        printf(" Flags %04x (%s/%s)",(int)flags,frameType,structureType);
+        printf(" DTS %s",ADM_us2plain(dts));
+        printf(" PTS %s\n",ADM_us2plain(pts));
+    }
 
-	return 0;
+    return 0;
 }
 /**
     \fn pyGetPts

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt Changed

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264.cpp Added

@@ -0,0 +1,355 @@
+/***************************************************************************
+ \fn libvaEnc_plugin
+ \brief Plugin to use libva hw encoder (intel mostly)
+ -------------------
+
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+ /***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_bitstream.h"
+#include "ADM_coreVideoEncoder.h"
+#include "ADM_videoInfoExtractor.h"
+
+
+#include "va/va.h"
+#include "va/va_enc_h264.h"
+#include "ADM_coreLibVA_buffer.h"
+#include "ADM_libVaEncodingContextH264.h"
+
+
+/**
+ * 
+ */
+ADM_vaEncodingContextH264Base::ADM_vaEncodingContextH264Base()
+{
+ aprintf("vaH264 ctor\n");
+ context_id=VA_INVALID;
+ config_id=VA_INVALID;
+ 
+ current_frame_encoding=0;
+
+ for(int i=0;i<VA_ENC_NB_SURFACE;i++)
+ vaEncodingBuffers[i]=NULL;;
+ for(int i=0;i<VA_ENC_NB_SURFACE;i++) 
+ {
+ vaSurface[i]=NULL;
+ vaRefSurface[i]=NULL;
+ }
+ memset(&seq_param, 0, sizeof(seq_param));
+ memset(&pic_param, 0, sizeof(pic_param));
+ memset(&slice_param, 0, sizeof(slice_param));
+ 
+ num_ref_frames = 1;
+ 
+ 
+ numShortTerm = 0;
+ MaxPicOrderCntLsb = (2<<8);
+ Log2MaxFrameNum = 16;
+ Log2MaxPicOrderCntLsb = 8;
+
+
+ // RC
+ initial_qp = 15;
+ minimal_qp = 0;
+ rc_mode = VA_RC_CBR; //VA_RC_CQP;
+ aprintf("/vaH264 ctor\n");
+ tmpBuffer=NULL;
+}
+/**
+ * 
+ */
+ADM_vaEncodingContextH264Base::~ADM_vaEncodingContextH264Base()
+{
+ aprintf("vaH264 dtor\n");
+ if(context_id!=VA_INVALID)
+ {
+ vaDestroyContext(admLibVA::getDisplay(),context_id);
+ context_id=VA_INVALID;
+ }
+ if(config_id!=VA_INVALID)
+ {
+ vaDestroyConfig(admLibVA::getDisplay(),config_id);
+ config_id=VA_INVALID;
+ }
+ for(int i=0;i<VA_ENC_NB_SURFACE;i++)
+ {
+ if(vaSurface[i])
+ {
+ delete vaSurface[i];
+ vaSurface[i]=NULL;
+ }
+ if(vaRefSurface[i])
+ {
+ delete vaRefSurface[i];
+ vaRefSurface[i]=NULL;
+ }
+
+ }
+ aprintf("/vaH264 dtor\n");
+}
+/**
+ * 
+ * @param width
+ * @param height
+ * @param knownSurfaces
+ * @return 
+ */
+bool ADM_vaEncodingContextH264Base::setup( int width, int height, int frameInc,std::vector<ADM_vaSurface *>knownSurfaces)
+{
+ ADM_info("vaH264 setup\n");
+ 
+ h264=vaGetH264EncoderProfile();
+ if(h264->profile==VAProfileNone)
+ {
+ ADM_error("No H264 encoding support\n");
+ return false;
+ }
+ 
+ 
+ VAStatus va_status;
+ frame_width=width;
+ frame_height=height;
+ frame_width_mbaligned=(width+15)&~15;
+ frame_height_mbaligned=(height+15)&~15;
+ int i;
+ usSecondsToFrac(frameInc,&frameNum,&frameDen); 
+ ADM_info("xFps : %d : %d\n",frameNum,frameDen);
+ // marshall new config...
+ 
+ // copy common part
+ int nAttrib=h264->newAttributes.count();
+ int outAttrib=0;
+ VAConfigAttrib *ttrib=new VAConfigAttrib[nAttrib+1];
+ const VAConfigAttrib *old=h264->newAttributes.getPointer();
+ 
+ for(int i=0;i<nAttrib;i++)
+ {
+ ttrib[outAttrib]=old[i];
+ if(ttrib[outAttrib].type==VAConfigAttribEncPackedHeaders) // remove packed
+ ttrib[outAttrib].value=getPackedAttributes();
+ outAttrib++;
+ 
+ } 
+ // add rate control, it is per instance
+ ttrib[outAttrib].type=VAConfigAttribRateControl;
+ ttrib[outAttrib].value=VA_RC_CBR;
+ outAttrib++;
+ 
+ CHECK_VA_STATUS_BOOL( vaCreateConfig(admLibVA::getDisplay(), h264->profile, VAEntrypointEncSlice, ttrib, outAttrib, &config_id));
+ 
+
+ int n=knownSurfaces.size(); 
+ VASurfaceID *tmp_surfaceId = new VASurfaceID[n];
+ for(int i=0;i<n;i++)
+ {
+ tmp_surfaceId[i]=knownSurfaces[i]->surface;
+ }
+
+ /* Create a context for this encode pipe */
+ CHECK_VA_STATUS_BOOL( vaCreateContext(admLibVA::getDisplay(), config_id,
+ frame_width_mbaligned, frame_height_mbaligned,
+ VA_PROGRESSIVE,
+ tmp_surfaceId, n,
+ &context_id));
+ 
+ delete [] ttrib;
+ delete [] tmp_surfaceId;
+ tmp_surfaceId=NULL;
+
+ int codedbuf_size = (frame_width_mbaligned * frame_height_mbaligned * 400) / (16*16);
+
+ for (i = 0; i < SURFACE_NUM; i++) 
+ {
+ vaEncodingBuffers[i]= ADM_vaEncodingBuffers::allocate(context_id,codedbuf_size);
+ if(!vaEncodingBuffers[i])
+ {
+ ADM_warning("Cannot create encoding buffer %d\n",i);
+ return false;;
+ }
+ }
+
+ // Allocate VAImage
+
+ for(int i=0;i<VA_ENC_NB_SURFACE;i++)
+ {
+ vaSurface[i]=ADM_vaSurface::allocateWithSurface(width,height);
+ if(!vaSurface[i]) 
+ {
+ ADM_warning("Cannot allocate surface\n");
+ return false;
+ }
+
+ vaRefSurface[i]=ADM_vaSurface::allocateWithSurface(width,height);
+ if(!vaRefSurface[i]) 
+ {
+ ADM_warning("Cannot allocate ref surface\n");
+ return false;
+ }
+ }
+ tmpBuffer=new uint8_t[codedbuf_size];
+ render_sequence();
+ ADM_info("/vaH264 setup\n");
+ return true; 
+}
+
+
+//-- Global Header
+
+bool ADM_vaEncodingContextH264Base::generateExtraData(int *size, uint8_t **data)
+{
+ aprintf("vaH264 extraData\n");
+ vaBitstream sps,pps;
+ 
+ fillSeqParam();
+ sps_rbsp(&sps);
+ 
+ fillPPS(0,FRAME_IDR);
+ pps_rbsp(&pps);
+ 
+ sps.stop();
+ pps.stop();
+ 
+ int spsLen=sps.lengthInBytes();
+ int ppsLen=pps.lengthInBytes();
+ 
+ *data =new uint8_t[spsLen+ppsLen+20];
+ 
+ uint8_t *p=*data;
+ *p++=1;
+ *p++=sps.getPointer()[0];
+ *p++=sps.getPointer()[1];
+ *p++=sps.getPointer()[2];
+ *p++=0xff;
+ // SPS
+ *p++=0xe1;
+ *p++=(1+spsLen)>>8;
+ *p++=(1+spsLen)&0xff;
+ *p++=NAL_SPS; // SPS NALU
+ memcpy(p,sps.getPointer(),spsLen);
+ p+=spsLen;
+ // PPS
+ *p++=1;
+ *p++=(1+ppsLen)>>8;
+ *p++=(1+ppsLen)&0xff;
+ *p++=NAL_PPS;
+ memcpy(p,pps.getPointer(),ppsLen);
+ p+=ppsLen;
+ *size=(intptr_t)(p)-(intptr_t)*data;
+ 
+ mixDump(*data,*size);
+ 
+ aprintf("/vaH264 extraData\n");
+ return true;
+}
+/**
+ * 
+ * @param in
+ * @param out
+ * @return 
+ */
+bool ADM_vaEncodingContextH264Base::encode(ADMImage *in, ADMBitstream *out)
+{
+ aprintf("Encoding frame %d, H264 AVC\n",current_frame_encoding);
+ vaFrameType current_frame_type;
+ if(!vaSurface[current_frame_encoding%SURFACE_NUM]->fromAdmImage(in))
+ {
+ ADM_warning("Failed to upload image to vaSurface\n");
+ return false;
+ }
+
+ encoding2display_order(current_frame_encoding, vaH264Settings.IntraPeriod, &current_frame_type);
+ aprintf("Encoding order = %d, frame type=%d\n",(int)current_frame_encoding,current_frame_type); 
+ int current_slot= (current_frame_encoding % SURFACE_NUM);
+
+ CHECK_VA_STATUS_BOOL(vaBeginPicture(admLibVA::getDisplay(), context_id, vaSurface[current_slot]->surface));
+ 
+
+ 
+ if (current_frame_type == FRAME_IDR) 
+ {
+ out->flags = AVI_KEY_FRAME;
+ }else
+ {
+ out->flags = AVI_P_FRAME;
+ }
+ render_picture(current_frame_encoding,current_frame_type); 
+ render_slice(current_frame_encoding,current_frame_type); 
+ CHECK_VA_STATUS_BOOL( vaEndPicture(admLibVA::getDisplay(),context_id));
+ //-- 
+ 
+ CHECK_VA_STATUS_BOOL( vaSyncSurface(admLibVA::getDisplay(), vaSurface[current_frame_encoding % SURFACE_NUM]->surface));
+ 
+ #if 0 // Heavy convert
+
+ int len=vaEncodingBuffers[current_frame_encoding % SURFACE_NUM]->read(tmpBuffer, out->bufferSize);
+ int l=ADM_unescapeH264(len-4,tmpBuffer+4,out->data+4);
+ out->data[0]=l>>24;
+ out->data[1]=l>>16;
+ out->data[2]=l>>8;
+ out->data[3]=l>>0;
+ out->len=l+4;
+
+ #else // light convert, no escape
+ out->len=vaEncodingBuffers[current_frame_encoding % SURFACE_NUM]->read(out->data, out->bufferSize);
+ ADM_assert(out->len>=0);
+
+ // Set NAL Size (wtf ?)
+ int l=out->len-4;
+ out->data[0]=l>>24;
+ out->data[1]=l>>16;
+ out->data[2]=l>>8;
+ out->data[3]=l>>0;
+ #endif 
+ /* reload a new frame data */
+
+ update_ReferenceFrames(current_frame_type); 
+ current_frame_encoding++;
+ out->pts=in->Pts;
+ out->dts=out->pts;
+ return true;
+}
+
+// EOF

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264.h Added

@@ -0,0 +1,203 @@
+/***************************************************************************
+ \fn libvaEnc_plugin
+ \brief Plugin to use libva hw encoder (intel mostly)
+ -------------------
+
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ * 
+ * 
+
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+ /***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#pragma once
+/**
+ * 
+ */
+#define VA_ENC_NB_SURFACE 16
+#include "ADM_coreLibVA_encodingContext.h"
+#include "ADM_coreLibVA_bitstream.h"
+#include "vaDefines.h"
+#include "vaenc_settings.h"
+#include "ADM_coreLibVA_h264Encoding.h"
+#include "vaenc_settings.h"
+#include "ADM_libvaEncoder_debug.h"
+extern vaconf_settings vaH264Settings;
+
+
+#define VA_BITRATE (vaH264Settings.BitrateKbps*1000)
+
+/**
+ * \class ADM_vaEncodingContextH264Base
+ * \brief This one is AVC format
+ */
+class ADM_vaEncodingContextH264Base : public ADM_vaEncodingContext
+{
+public:
+ ADM_vaEncodingContextH264Base() ; 
+virtual ~ADM_vaEncodingContextH264Base();
+virtual bool setup( int width, int height, int frameInc, std::vector<ADM_vaSurface *>knownSurfaces);
+virtual bool encode(ADMImage *in, ADMBitstream *out);
+virtual bool generateExtraData(int *size, uint8_t **data);
+virtual int getPackedAttributes()
+ {
+ return 0;
+ }
+protected: 
+//-- Per instance configuration --
+ VAConfigID config_id;
+ VAContextID context_id;
+ 
+ 
+ VAEncSequenceParameterBufferH264 seq_param;
+ VAEncPictureParameterBufferH264 pic_param;
+ VAEncSliceParameterBufferH264 slice_param;
+ VAPictureH264 CurrentCurrPic;
+ VAPictureH264 ReferenceFrames[16], RefPicList0_P[32], RefPicList0_B[32], RefPicList1_B[32];
+
+ unsigned int num_ref_frames;
+ unsigned int numShortTerm;
+
+ unsigned int MaxPicOrderCntLsb;
+ unsigned int Log2MaxFrameNum;
+ unsigned int Log2MaxPicOrderCntLsb;
+
+
+ 
+ int frame_width;
+ int frame_height;
+ int frame_width_mbaligned;
+ int frame_height_mbaligned;
+ int gop_start;
+ uint64_t current_frame_encoding;
+ 
+ // -- RC --
+ 
+ int initial_qp;
+ int minimal_qp;
+ int rc_mode;
+ 
+ int frameDen,frameNum;
+ //--
+ ADM_vaEncodingBuffers *vaEncodingBuffers[VA_ENC_NB_SURFACE];
+ ADM_vaSurface *vaSurface[VA_ENC_NB_SURFACE];
+ ADM_vaSurface *vaRefSurface[VA_ENC_NB_SURFACE];
+ uint8_t *tmpBuffer;
+
+ void sps_rbsp(vaBitstream *bs);
+ void pps_rbsp(vaBitstream *bs);
+ 
+ 
+ 
+ void encoding2display_order( uint64_t encoding_order, int intra_idr_period, vaFrameType *frame_type);
+ bool update_ReferenceFrames(vaFrameType frameType);
+ bool update_RefPicList(vaFrameType frameType); 
+ int calc_poc(int pic_order_cnt_lsb,vaFrameType frameType);
+ // MP4
+ bool render_sequence(void);
+ bool render_picture(int frameNumber,vaFrameType frameType);
+ 
+ void slice_header(vaBitstream *bs);
+ 
+ 
+ bool render_hrd(void);
+
+ //
+ void fillSeqParam();
+ void fillPPS(int frameNumber, vaFrameType frameType);
+virtual bool render_slice(int frameNumber,vaFrameType frameType); 
+ 
+ const ADM_VA_GlobalH264 *h264;
+ 
+};
+
+
+/**
+ * \class ADM_vaEncodingContextH264AnnexB
+ * \brief This one is AnnexB format (mpeg TS)
+ */
+
+class ADM_vaEncodingContextH264AnnexB: public ADM_vaEncodingContextH264Base
+{
+public:
+ ADM_vaEncodingContextH264AnnexB() ; 
+ virtual ~ADM_vaEncodingContextH264AnnexB();
+ virtual bool setup( int width, int height, int frameInc, std::vector<ADM_vaSurface *>knownSurfaces);
+ virtual bool encode(ADMImage *in, ADMBitstream *out);
+ virtual bool generateExtraData(int *size, uint8_t **data);
+ 
+protected: 
+
+ 
+ bool build_packed_pic_buffer(vaBitstream *bs);
+ bool build_packed_seq_buffer(vaBitstream *bs); 
+ bool build_packed_sei_buffer_timing(vaBitstream *bs,
+ unsigned int init_cpb_removal_length,
+				unsigned int init_cpb_removal_delay,
+				unsigned int init_cpb_removal_delay_offset,
+				unsigned int cpb_removal_length,
+				unsigned int cpb_removal_delay,
+				unsigned int dpb_output_length,
+				unsigned int dpb_output_delay);
+ 
+ 
+ 
+ // Annex B
+ bool render_packedsequence(void);
+ bool render_packedpicture(void);
+ bool render_packedsei(int frameNumber);
+ bool render_packedslice(void);
+ bool build_packed_slice_buffer(vaBitstream *bs);
+ 
+ bool render_hrd(void);
+ bool render_slice(int frameNumber,vaFrameType frameType); 
+ int getPackedAttributes()
+ {
+ return h264->packedHeaderCapabilities;
+ }
+ 
+};
+
+// EOF 
+

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264_misc.cpp Added

@@ -0,0 +1,412 @@
+/***************************************************************************
+ \fn libvaEnc_plugin
+ \brief Plugin to use libva hw encoder (intel mostly)
+ -------------------
+
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+/***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "va/va.h"
+#include "va/va_enc_h264.h"
+#include "ADM_coreLibVA_buffer.h"
+#include "ADM_libVaEncodingContextH264.h"
+
+#include "vaenc_settings.h"
+extern vaconf_settings vaH264Settings;
+/**
+ * 
+ * @param bs
+ */
+void ADM_vaEncodingContextH264Base::sps_rbsp(vaBitstream *bs)
+{
+ int profile_idc = PROFILE_IDC_BASELINE;
+ int constraint_set_flag=0; 
+ 
+ switch(h264->profile)
+ {
+ case VAProfileH264High:
+ profile_idc = PROFILE_IDC_HIGH;
+ constraint_set_flag=(1 << 3);
+ break;
+ case VAProfileH264Main:
+ profile_idc = PROFILE_IDC_MAIN;
+ constraint_set_flag=(1 << 1);
+ break;
+ default:
+ ADM_assert(0);
+ break;
+ } 
+ bs->put_ui(profile_idc, 8); /* profile_idc */
+ 
+ bs->put_ui(!!(constraint_set_flag & 1), 1); /* constraint_set0_flag */
+ bs->put_ui(!!(constraint_set_flag & 2), 1); /* constraint_set1_flag */
+ bs->put_ui(!!(constraint_set_flag & 4), 1); /* constraint_set2_flag */
+ bs->put_ui(!!(constraint_set_flag & 8), 1); /* constraint_set3_flag */
+ bs->put_ui(0, 4); /* reserved_zero_4bits */
+ bs->put_ui(seq_param.level_idc, 8); /* level_idc */
+ bs->put_ue(seq_param.seq_parameter_set_id); /* seq_parameter_set_id */
+
+ if (profile_idc == PROFILE_IDC_HIGH)
+ {
+ bs->put_ue(1); /* chroma_format_idc = 1, 4:2:0 */
+ bs->put_ue(0); /* bit_depth_luma_minus8 */
+ bs->put_ue(0); /* bit_depth_chroma_minus8 */
+ bs->put_ui(0, 1); /* qpprime_y_zero_transform_bypass_flag */
+ bs->put_ui(0, 1); /* seq_scaling_matrix_present_flag */
+ }
+
+ bs->put_ue(seq_param.seq_fields.bits.log2_max_frame_num_minus4); /* log2_max_frame_num_minus4 */
+ bs->put_ue(seq_param.seq_fields.bits.pic_order_cnt_type); /* pic_order_cnt_type */
+
+ if (seq_param.seq_fields.bits.pic_order_cnt_type == 0)
+ bs->put_ue(seq_param.seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4); /* log2_max_pic_order_cnt_lsb_minus4 */
+ else
+ {
+ assert(0);
+ }
+
+ bs->put_ue(seq_param.max_num_ref_frames); /* num_ref_frames */
+ bs->put_ui(0, 1); /* gaps_in_frame_num_value_allowed_flag */
+
+ bs->put_ue(seq_param.picture_width_in_mbs - 1); /* pic_width_in_mbs_minus1 */
+ bs->put_ue(seq_param.picture_height_in_mbs - 1); /* pic_height_in_map_units_minus1 */
+ bs->put_ui(seq_param.seq_fields.bits.frame_mbs_only_flag, 1); /* frame_mbs_only_flag */
+
+ if (!seq_param.seq_fields.bits.frame_mbs_only_flag)
+ {
+ assert(0);
+ }
+
+ bs->put_ui(seq_param.seq_fields.bits.direct_8x8_inference_flag, 1); /* direct_8x8_inference_flag */
+ bs->put_ui(seq_param.frame_cropping_flag, 1); /* frame_cropping_flag */
+
+ if (seq_param.frame_cropping_flag)
+ {
+ bs->put_ue(seq_param.frame_crop_left_offset); /* frame_crop_left_offset */
+ bs->put_ue(seq_param.frame_crop_right_offset); /* frame_crop_right_offset */
+ bs->put_ue(seq_param.frame_crop_top_offset); /* frame_crop_top_offset */
+ bs->put_ue(seq_param.frame_crop_bottom_offset); /* frame_crop_bottom_offset */
+ }
+
+ //if ( frame_bit_rate < 0 ) { //TODO EW: the vui header isn't correct
+ if (1)
+ {
+ bs->put_ui(0, 1); /* vui_parameters_present_flag */
+ }
+ else
+ {
+ bs->put_ui(1, 1); /* vui_parameters_present_flag */
+ bs->put_ui(0, 1); /* aspect_ratio_info_present_flag */
+ bs->put_ui(0, 1); /* overscan_info_present_flag */
+ bs->put_ui(0, 1); /* video_signal_type_present_flag */
+ bs->put_ui(0, 1); /* chroma_loc_info_present_flag */
+ bs->put_ui(1, 1); /* timing_info_present_flag */
+ {
+ bs->put_ui(15, 32);
+ bs->put_ui(900, 32);
+ bs->put_ui(1, 1);
+ }
+ bs->put_ui(1, 1); /* nal_hrd_parameters_present_flag */
+ {
+ // hrd_parameters 
+ bs->put_ue(0); /* cpb_cnt_minus1 */
+ bs->put_ui(4, 4); /* bit_rate_scale */
+ bs->put_ui(6, 4); /* cpb_size_scale */
+
+ bs->put_ue(vaH264Settings.BitrateKbps*1000 - 1); /* bit_rate_value_minus1[0] */
+ bs->put_ue(vaH264Settings.BitrateKbps * 8000 - 1); /* cpb_size_value_minus1[0] */
+ bs->put_ui(1, 1); /* cbr_flag[0] */
+
+ bs->put_ui(23, 5); /* initial_cpb_removal_delay_length_minus1 */
+ bs->put_ui(23, 5); /* cpb_removal_delay_length_minus1 */
+ bs->put_ui(23, 5); /* dpb_output_delay_length_minus1 */
+ bs->put_ui(23, 5); /* time_offset_length */
+ }
+ bs->put_ui(0, 1); /* vcl_hrd_parameters_present_flag */
+ bs->put_ui(0, 1); /* low_delay_hrd_flag */
+
+ bs->put_ui(0, 1); /* pic_struct_present_flag */
+ bs->put_ui(0, 1); /* bitstream_restriction_flag */
+ }
+ bs->rbspTrailingBits();
+ /* rbsp_trailing_bits */
+}
+
+/**
+ * 
+ * @param bs
+ */
+void ADM_vaEncodingContextH264Base::pps_rbsp(vaBitstream *bs)
+{
+ bs->put_ue(pic_param.pic_parameter_set_id); /* pic_parameter_set_id */
+ bs->put_ue(pic_param.seq_parameter_set_id); /* seq_parameter_set_id */
+
+ bs->put_ui(pic_param.pic_fields.bits.entropy_coding_mode_flag, 1); /* entropy_coding_mode_flag */
+
+ bs->put_ui(0, 1); /* pic_order_present_flag: 0 */
+
+ bs->put_ue(0); /* num_slice_groups_minus1 */
+
+ bs->put_ue(pic_param.num_ref_idx_l0_active_minus1); /* num_ref_idx_l0_active_minus1 */
+ bs->put_ue(pic_param.num_ref_idx_l1_active_minus1); /* num_ref_idx_l1_active_minus1 1 */
+
+ bs->put_ui(pic_param.pic_fields.bits.weighted_pred_flag, 1); /* weighted_pred_flag: 0 */
+ bs->put_ui(pic_param.pic_fields.bits.weighted_bipred_idc, 2); /* weighted_bipred_idc: 0 */
+
+ bs->put_se(pic_param.pic_init_qp - 26); /* pic_init_qp_minus26 */
+ bs->put_se(0); /* pic_init_qs_minus26 */
+ bs->put_se(0); /* chroma_qp_index_offset */
+
+ bs->put_ui(pic_param.pic_fields.bits.deblocking_filter_control_present_flag, 1); /* deblocking_filter_control_present_flag */
+ bs->put_ui(0, 1); /* constrained_intra_pred_flag */
+ bs->put_ui(0, 1); /* redundant_pic_cnt_present_flag */
+
+ /* more_rbsp_data */
+ bs->put_ui(pic_param.pic_fields.bits.transform_8x8_mode_flag, 1); /*transform_8x8_mode_flag */
+ bs->put_ui(0, 1); /* pic_scaling_matrix_present_flag */
+ bs->put_se(pic_param.second_chroma_qp_index_offset); /*second_chroma_qp_index_offset */
+
+ bs->rbspTrailingBits();
+}
+
+/**
+ * 
+ * @param bs
+ */
+void ADM_vaEncodingContextH264Base::slice_header(vaBitstream *bs)
+{
+ int first_mb_in_slice = slice_param.macroblock_address;
+
+ bs->put_ue(first_mb_in_slice); /* first_mb_in_slice: 0 */
+ bs->put_ue(slice_param.slice_type); /* slice_type */
+ bs->put_ue(slice_param.pic_parameter_set_id); /* pic_parameter_set_id: 0 */
+ bs->put_ui(pic_param.frame_num, seq_param.seq_fields.bits.log2_max_frame_num_minus4 + 4); /* frame_num */
+
+ /* frame_mbs_only_flag == 1 */
+ if (!seq_param.seq_fields.bits.frame_mbs_only_flag)
+ {
+ /* FIXME: */
+ assert(0);
+ }
+
+ if (pic_param.pic_fields.bits.idr_pic_flag)
+ bs->put_ue(slice_param.idr_pic_id); /* idr_pic_id: 0 */
+
+ if (seq_param.seq_fields.bits.pic_order_cnt_type == 0)
+ {
+ bs->put_ui(pic_param.CurrPic.TopFieldOrderCnt, seq_param.seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4 + 4);
+ /* pic_order_present_flag == 0 */
+ }
+ else
+ {
+ /* FIXME: */
+ assert(0);
+ }
+
+ /* redundant_pic_cnt_present_flag == 0 */
+ /* slice type */
+ if (IS_P_SLICE(slice_param.slice_type))
+ {
+ bs->put_ui(slice_param.num_ref_idx_active_override_flag, 1); /* num_ref_idx_active_override_flag: */
+
+ if (slice_param.num_ref_idx_active_override_flag)
+ bs->put_ue(slice_param.num_ref_idx_l0_active_minus1);
+
+ /* ref_pic_list_reordering */
+ bs->put_ui(0, 1); /* ref_pic_list_reordering_flag_l0: 0 */
+ }
+ else if (IS_B_SLICE(slice_param.slice_type))
+ {
+ bs->put_ui(slice_param.direct_spatial_mv_pred_flag, 1); /* direct_spatial_mv_pred: 1 */
+
+ bs->put_ui(slice_param.num_ref_idx_active_override_flag, 1); /* num_ref_idx_active_override_flag: */
+
+ if (slice_param.num_ref_idx_active_override_flag)
+ {
+ bs->put_ue(slice_param.num_ref_idx_l0_active_minus1);
+ bs->put_ue(slice_param.num_ref_idx_l1_active_minus1);
+ }
+
+ /* ref_pic_list_reordering */
+ bs->put_ui(0, 1); /* ref_pic_list_reordering_flag_l0: 0 */
+ bs->put_ui(0, 1); /* ref_pic_list_reordering_flag_l1: 0 */
+ }
+
+ if ((pic_param.pic_fields.bits.weighted_pred_flag &&
+ IS_P_SLICE(slice_param.slice_type)) ||
+ ((pic_param.pic_fields.bits.weighted_bipred_idc == 1) &&
+ IS_B_SLICE(slice_param.slice_type)))
+ {
+ /* FIXME: fill weight/offset table */
+ assert(0);
+ }
+
+ /* dec_ref_pic_marking */
+ if (pic_param.pic_fields.bits.reference_pic_flag)
+ { /* nal_ref_idc != 0 */
+ unsigned char no_output_of_prior_pics_flag = 0;
+ unsigned char long_term_reference_flag = 0;
+ unsigned char adaptive_ref_pic_marking_mode_flag = 0;
+
+ if (pic_param.pic_fields.bits.idr_pic_flag)
+ {
+ bs->put_ui(no_output_of_prior_pics_flag, 1); /* no_output_of_prior_pics_flag: 0 */
+ bs->put_ui(long_term_reference_flag, 1); /* long_term_reference_flag: 0 */
+ }
+ else
+ {
+ bs->put_ui(adaptive_ref_pic_marking_mode_flag, 1); /* adaptive_ref_pic_marking_mode_flag: 0 */
+ }
+ }
+
+ if (pic_param.pic_fields.bits.entropy_coding_mode_flag &&
+ !IS_I_SLICE(slice_param.slice_type))
+ bs->put_ue(slice_param.cabac_init_idc); /* cabac_init_idc: 0 */
+
+ bs->put_se(slice_param.slice_qp_delta); /* slice_qp_delta: 0 */
+
+ /* ignore for SP/SI */
+
+ if (pic_param.pic_fields.bits.deblocking_filter_control_present_flag)
+ {
+ bs->put_ue(slice_param.disable_deblocking_filter_idc); /* disable_deblocking_filter_idc: 0 */
+
+ if (slice_param.disable_deblocking_filter_idc != 1)
+ {
+ bs->put_se(slice_param.slice_alpha_c0_offset_div2); /* slice_alpha_c0_offset_div2: 2 */
+ bs->put_se(slice_param.slice_beta_offset_div2); /* slice_beta_offset_div2: 2 */
+ }
+ }
+
+ if (pic_param.pic_fields.bits.entropy_coding_mode_flag)
+ {
+ bs->byteAlign(1);
+ }
+}
+
+
+/*
+ * Return displaying order with specified periods and encoding order
+ * displaying_order: displaying order
+ * frame_type: frame type 
+ */
+void ADM_vaEncodingContextH264Base::encoding2display_order(uint64_t encoding_order, int intra_idr_period, vaFrameType *frame_type)
+{
+ // simple use case, no delay encoding, only I(DR) PPPPPP
+ if (!encoding_order)
+ {
+ gop_start = 0;
+ *frame_type = FRAME_IDR;
+ }
+ else
+ {
+ int offset;
+ offset = encoding_order - gop_start;
+ if (offset >= intra_idr_period)
+ {
+ gop_start = encoding_order;
+ offset = 0;
+ *frame_type = FRAME_IDR;
+ }
+ else
+ {
+ *frame_type = FRAME_P;
+ }
+ }
+}
+
+#if 0 
+int encoding_order_gop = 0;
+
+if (intra_period == 1)
+{ /* all are I/IDR frames */
+ *displaying_order = encoding_order;
+ if (intra_idr_period == 0)
+ *frame_type = (encoding_order == 0) ? FRAME_IDR : FRAME_I;
+ else
+ *frame_type = (encoding_order % intra_idr_period == 0) ? FRAME_IDR : FRAME_I;
+ return;
+}
+
+if (intra_period == 0)
+ intra_idr_period = 0;
+
+/* new sequence like
+ * IDR PPPPP IPPPPP
+ * IDR (PBB)(PBB)(IBB)(PBB)
+ */
+encoding_order_gop = (intra_idr_period == 0) ? encoding_order :
+ (encoding_order % (intra_idr_period + ((ip_period == 1) ? 0 : 1)));
+
+if (encoding_order_gop == 0)
+{ /* the first frame */
+ *frame_type = FRAME_IDR;
+ *displaying_order = encoding_order;
+}
+else if (((encoding_order_gop - 1) % ip_period) != 0)
+{ /* B frames */
+ *frame_type = FRAME_B;
+ *displaying_order = encoding_order - 1;
+}
+else if ((intra_period != 0) && /* have I frames */
+ (encoding_order_gop >= 2) &&
+ ((ip_period == 1 && encoding_order_gop % intra_period == 0) || /* for IDR PPPPP IPPPP */
+ /* for IDR (PBB)(PBB)(IBB) */
+ (ip_period >= 2 && ((encoding_order_gop - 1) / ip_period % (intra_period / ip_period)) == 0)))
+{
+ *frame_type = FRAME_I;
+ *displaying_order = encoding_order + ip_period - 1;
+}
+else
+{
+ *frame_type = FRAME_P;
+ *displaying_order = encoding_order + ip_period - 1;
+}
+#endif
+
+
+// EOF
\ No newline at end of file

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264_packed.cpp Added

@@ -0,0 +1,685 @@
+/***************************************************************************
+ \fn libvaEnc_plugin
+ \brief Plugin to use libva hw encoder (intel mostly)
+ -------------------
+
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+/***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_bitstream.h"
+#include "ADM_coreVideoEncoder.h"
+#include "ADM_videoInfoExtractor.h"
+
+
+#include "va/va.h"
+#include "va/va_enc_h264.h"
+#include "ADM_coreLibVA_buffer.h"
+#include "ADM_libVaEncodingContextH264.h"
+
+
+/**
+ * 
+ * @param header_buffer
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::build_packed_pic_buffer(vaBitstream *bs)
+{
+ bs->startCodePrefix();
+ bs->nalHeader(NAL_REF_IDC_HIGH, NAL_PPS);
+ pps_rbsp(bs);
+ bs->startCodePrefix();
+ return true; // Offset
+}
+
+/**
+ * 
+ * @param header_buffer
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::build_packed_seq_buffer(vaBitstream *bs)
+{
+ bs->startCodePrefix();
+ bs->nalHeader(NAL_REF_IDC_HIGH, NAL_SPS);
+ sps_rbsp(bs);
+ bs->stop();
+ return true;
+}
+
+/**
+ * 
+ * @param init_cpb_removal_length
+ * @param init_cpb_removal_delay
+ * @param init_cpb_removal_delay_offset
+ * @param cpb_removal_length
+ * @param cpb_removal_delay
+ * @param dpb_output_length
+ * @param dpb_output_delay
+ * @param sei_buffer
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::build_packed_sei_buffer_timing(vaBitstream *bs,
+ unsigned int init_cpb_removal_length,
+ unsigned int init_cpb_removal_delay,
+ unsigned int init_cpb_removal_delay_offset,
+ unsigned int cpb_removal_length,
+ unsigned int cpb_removal_delay,
+ unsigned int dpb_output_length,
+ unsigned int dpb_output_delay)
+{
+ unsigned char *byte_buf;
+ int bp_byte_size, i, pic_byte_size;
+
+
+ // sei _bp 
+ vaBitstream sei_bp;
+ sei_bp.put_ue(0);
+ sei_bp.put_ui(init_cpb_removal_delay, cpb_removal_length);
+ sei_bp.put_ui(init_cpb_removal_delay_offset, cpb_removal_length);
+ sei_bp.add1BitIfNotaligned();
+ sei_bp.stop();
+ bp_byte_size = (sei_bp.lengthInBits() + 7) / 8;
+
+ // sei_pic
+ vaBitstream sei_pic;
+
+ sei_pic.put_ui(cpb_removal_delay, cpb_removal_length);
+ sei_pic.put_ui(dpb_output_delay, dpb_output_length);
+ sei_pic.add1BitIfNotaligned();
+ sei_pic.stop();
+ pic_byte_size = (sei_bp.lengthInBits() + 7) / 8;
+ //--- nal
+ vaBitstream nal;
+
+ nal.startCodePrefix();
+ nal.nalHeader(NAL_REF_IDC_NONE, NAL_SEI);
+
+ /* Write the SEI buffer period data */
+ nal.put_ui(0, 8);
+ nal.put_ui(bp_byte_size, 8);
+
+
+ //------------ Merge-------------
+
+ byte_buf = sei_bp.getPointer();
+ for (i = 0; i < bp_byte_size; i++)
+ {
+ nal.put_ui(byte_buf[i], 8);
+ }
+
+ /* write the SEI timing data */
+ nal.put_ui(0x01, 8);
+ nal.put_ui(pic_byte_size, 8);
+
+ byte_buf = sei_pic.getPointer();
+ for (i = 0; i < pic_byte_size; i++)
+ {
+ nal.put_ui(byte_buf[i], 8);
+ }
+
+ nal.rbspTrailingBits();
+ nal.stop();
+ return true;
+}
+
+/**
+ * 
+ * @param header_buffer
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::build_packed_slice_buffer(vaBitstream *bs)
+{
+ int is_idr = !!pic_param.pic_fields.bits.idr_pic_flag;
+ int is_ref = !!pic_param.pic_fields.bits.reference_pic_flag;
+
+ bs->startCodePrefix();
+ if (IS_I_SLICE(slice_param.slice_type))
+ {
+ bs->nalHeader(NAL_REF_IDC_HIGH, is_idr ? NAL_IDR : NAL_NON_IDR);
+ }
+ else if (IS_P_SLICE(slice_param.slice_type))
+ {
+ bs->nalHeader(NAL_REF_IDC_MEDIUM, NAL_NON_IDR);
+ }
+ else
+ {
+ assert(IS_B_SLICE(slice_param.slice_type));
+ bs->nalHeader(is_ref ? NAL_REF_IDC_LOW : NAL_REF_IDC_NONE, NAL_NON_IDR);
+ }
+ slice_header(bs);
+ bs->stop();
+ return true;
+}
+
+/**
+ * 
+ */
+bool ADM_vaEncodingContextH264AnnexB::render_packedslice()
+{
+ VAEncPackedHeaderParameterBuffer packedheader_param_buffer;
+ VABufferID packedslice_para_bufid, packedslice_data_bufid, render_id[2];
+ unsigned int length_in_bits;
+
+ VAStatus va_status;
+ vaBitstream bs;
+ build_packed_slice_buffer(&bs);
+ length_in_bits = bs.lengthInBits();
+
+ packedheader_param_buffer.type = VAEncPackedHeaderSlice;
+ packedheader_param_buffer.bit_length = length_in_bits;
+ packedheader_param_buffer.has_emulation_bytes = 0;
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderParameterBufferType,
+ sizeof (packedheader_param_buffer), 1, &packedheader_param_buffer,
+ &packedslice_para_bufid));
+
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderDataBufferType,
+ (length_in_bits + 7) / 8, 1, bs.getPointer(),
+ &packedslice_data_bufid));
+
+
+ render_id[0] = packedslice_para_bufid;
+ render_id[1] = packedslice_data_bufid;
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, render_id, 2));
+
+ return true;
+}
+
+
+/**
+ * 
+ */
+bool ADM_vaEncodingContextH264AnnexB::render_packedsei(int frameNumber)
+{
+ VAEncPackedHeaderParameterBuffer packed_header_param_buffer;
+ VABufferID packed_sei_header_param_buf_id, packed_sei_buf_id, render_id[2];
+ unsigned int length_in_bits /*offset_in_bytes*/;
+
+ VAStatus va_status;
+ vaBitstream bs;
+ int init_cpb_size, target_bit_rate, i_initial_cpb_removal_delay_length, i_initial_cpb_removal_delay;
+ int i_cpb_removal_delay, i_dpb_output_delay_length, i_cpb_removal_delay_length;
+
+ /* it comes for the bps defined in SPS */
+ target_bit_rate = VA_BITRATE;
+ init_cpb_size = (target_bit_rate * 8) >> 10;
+ i_initial_cpb_removal_delay = init_cpb_size * 0.5 * 1024 / target_bit_rate * 90000;
+
+ i_cpb_removal_delay = 2;
+ i_initial_cpb_removal_delay_length = 24;
+ i_cpb_removal_delay_length = 24;
+ i_dpb_output_delay_length = 24;
+
+
+ build_packed_sei_buffer_timing(&bs,
+ i_initial_cpb_removal_delay_length,
+ i_initial_cpb_removal_delay,
+ 0,
+ i_cpb_removal_delay_length,
+ i_cpb_removal_delay * frameNumber,
+ i_dpb_output_delay_length,
+ 0);
+ length_in_bits = bs.lengthInBits();
+ //offset_in_bytes = 0;
+ packed_header_param_buffer.type = VAEncPackedHeaderH264_SEI;
+ packed_header_param_buffer.bit_length = length_in_bits;
+ packed_header_param_buffer.has_emulation_bytes = 0;
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderParameterBufferType,
+ sizeof (packed_header_param_buffer), 1, &packed_header_param_buffer,
+ &packed_sei_header_param_buf_id));
+
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderDataBufferType,
+ (length_in_bits + 7) / 8, 1, bs.getPointer(),
+ &packed_sei_buf_id));
+
+
+
+ render_id[0] = packed_sei_header_param_buf_id;
+ render_id[1] = packed_sei_buf_id;
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, render_id, 2));
+
+ return true;
+}
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::render_packedpicture(void)
+{
+ VAEncPackedHeaderParameterBuffer packedheader_param_buffer;
+ VABufferID packedpic_para_bufid, packedpic_data_bufid, render_id[2];
+ unsigned int length_in_bits;
+
+ VAStatus va_status;
+ vaBitstream bs;
+
+
+ build_packed_pic_buffer(&bs);
+ length_in_bits = bs.lengthInBits();
+ packedheader_param_buffer.type = VAEncPackedHeaderPicture;
+ packedheader_param_buffer.bit_length = length_in_bits;
+ packedheader_param_buffer.has_emulation_bytes = 0;
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderParameterBufferType,
+ sizeof (packedheader_param_buffer), 1, &packedheader_param_buffer,
+ &packedpic_para_bufid));
+
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderDataBufferType,
+ (length_in_bits + 7) / 8, 1, bs.getPointer(),
+ &packedpic_data_bufid));
+
+
+ render_id[0] = packedpic_para_bufid;
+ render_id[1] = packedpic_data_bufid;
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, render_id, 2));
+
+
+ return true;
+}
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::render_packedsequence(void)
+{
+ VAEncPackedHeaderParameterBuffer packedheader_param_buffer;
+ VABufferID packedseq_para_bufid, packedseq_data_bufid, render_id[2];
+ unsigned int length_in_bits;
+
+ VAStatus va_status;
+ vaBitstream bs;
+
+ build_packed_seq_buffer(&bs);
+ length_in_bits = bs.lengthInBits();
+
+ packedheader_param_buffer.type = VAEncPackedHeaderSequence;
+
+ packedheader_param_buffer.bit_length = length_in_bits; /*length_in_bits*/
+ packedheader_param_buffer.has_emulation_bytes = 0;
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderParameterBufferType,
+ sizeof (packedheader_param_buffer), 1, &packedheader_param_buffer,
+ &packedseq_para_bufid));
+
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(),
+ context_id,
+ VAEncPackedHeaderDataBufferType,
+ (length_in_bits + 7) / 8, 1, bs.getPointer(),
+ &packedseq_data_bufid));
+
+
+ render_id[0] = packedseq_para_bufid;
+ render_id[1] = packedseq_data_bufid;
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, render_id, 2));
+
+ return true;
+}
+
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::render_hrd(void)
+{
+ VABufferID misc_parameter_hrd_buf_id;
+ VAStatus va_status;
+ VAEncMiscParameterBuffer *misc_param;
+ VAEncMiscParameterHRD *misc_hrd_param;
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(), context_id,
+ VAEncMiscParameterBufferType,
+ sizeof (VAEncMiscParameterBuffer) + sizeof (VAEncMiscParameterHRD),
+ 1,
+ NULL,
+ &misc_parameter_hrd_buf_id));
+
+
+ vaMapBuffer(admLibVA::getDisplay(),
+ misc_parameter_hrd_buf_id,
+ (void **) &misc_param);
+ misc_param->type = VAEncMiscParameterTypeHRD;
+ misc_hrd_param = (VAEncMiscParameterHRD *) misc_param->data;
+
+ if (VA_BITRATE > 0)
+ {
+ misc_hrd_param->initial_buffer_fullness = VA_BITRATE* 1024 * 4;
+ misc_hrd_param->buffer_size = VA_BITRATE * 1024 * 8;
+ }
+ else
+ {
+ misc_hrd_param->initial_buffer_fullness = 0;
+ misc_hrd_param->buffer_size = 0;
+ }
+ vaUnmapBuffer(admLibVA::getDisplay(), misc_parameter_hrd_buf_id);
+
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, &misc_parameter_hrd_buf_id, 1));
+
+
+ return true;
+}
+//--
+
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::render_slice(int frameNumber,vaFrameType frameType)
+{
+ VABufferID slice_param_buf;
+ VAStatus va_status;
+ int i;
+
+ update_RefPicList(frameType);
+
+ /* one frame, one slice */
+ slice_param.macroblock_address = 0;
+ slice_param.num_macroblocks = frame_width_mbaligned * frame_height_mbaligned / (16 * 16); /* Measured by MB */
+ switch(frameType) 
+ {
+ case FRAME_IDR:
+ slice_param.slice_type =SLICE_TYPE_I;
+ if (frameNumber) 
+ slice_param.idr_pic_id++;
+ for (i = 0; i < 32; i++)
+ {
+ slice_param.RefPicList0[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ slice_param.RefPicList1[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList1[i].flags = VA_PICTURE_H264_INVALID;
+ 
+ } 
+ break;
+ case FRAME_P: 
+ {
+ slice_param.slice_type=SLICE_TYPE_P;
+ int refpiclist0_max = h264->h264_maxref_p0;
+ memcpy(slice_param.RefPicList0, RefPicList0_P, refpiclist0_max * sizeof (VAPictureH264));
+ for (i = refpiclist0_max; i < 32; i++)
+ {
+ slice_param.RefPicList0[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ }
+ }
+ break;
+ case FRAME_B:
+ {
+ slice_param.slice_type=SLICE_TYPE_B;
+ int refpiclist0_max = h264->h264_maxref_p0;
+ int refpiclist1_max = h264->h264_maxref_p1;
+
+ memcpy(slice_param.RefPicList0, RefPicList0_B, refpiclist0_max * sizeof (VAPictureH264));
+ for (i = refpiclist0_max; i < 32; i++)
+ {
+ slice_param.RefPicList0[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ memcpy(slice_param.RefPicList1, RefPicList1_B, refpiclist1_max * sizeof (VAPictureH264));
+ for (i = refpiclist1_max; i < 32; i++)
+ {
+ slice_param.RefPicList1[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList1[i].flags = VA_PICTURE_H264_INVALID;
+ }
+ }
+ break;
+ default:
+ ADM_assert(0);
+ break;
+ }
+ 
+ slice_param.slice_alpha_c0_offset_div2 = 0;
+ slice_param.slice_beta_offset_div2 = 0;
+ slice_param.direct_spatial_mv_pred_flag = 1;
+ slice_param.pic_order_cnt_lsb = (frameNumber - gop_start) % MaxPicOrderCntLsb;
+
+ 
+ render_packedslice();
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(), context_id, VAEncSliceParameterBufferType,
+ sizeof (slice_param), 1, &slice_param, &slice_param_buf));
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, &slice_param_buf, 1));
+ return true;
+}
+
+
+
+/**
+ * 
+ * @param in
+ * @param out
+ * @return 
+ */
+
+
+bool ADM_vaEncodingContextH264AnnexB::generateExtraData(int *size, uint8_t **data)
+{
+ ADM_info("vaH264 extraData\n");
+
+ *size=0;
+ *data=NULL; 
+ ADM_info("/vaH264 extraData\n");
+ return true;
+}
+bool ADM_vaEncodingContextH264AnnexB::encode(ADMImage *in, ADMBitstream *out)
+{
+ vaFrameType current_frame_type;
+ aprintf("Encoding frame %d, H264 AnnexB\n",current_frame_encoding);
+ if(!vaSurface[current_frame_encoding%SURFACE_NUM]->fromAdmImage(in))
+ {
+ ADM_warning("Failed to upload image to vaSurface\n");
+ return false;
+ }
+
+ encoding2display_order(current_frame_encoding, vaH264Settings.IntraPeriod, &current_frame_type);
+ aprintf("Encoding order = %d, frame type=%d\n",(int)current_frame_encoding,current_frame_type);
+ if (current_frame_type == FRAME_IDR) 
+ {
+ numShortTerm = 0;
+ }
+ int current_slot= (current_frame_encoding % SURFACE_NUM);
+
+ CHECK_VA_STATUS_BOOL(vaBeginPicture(admLibVA::getDisplay(), context_id, vaSurface[current_slot]->surface));
+ 
+
+ if (current_frame_type == FRAME_IDR) 
+ {
+ render_sequence();
+ render_picture(current_frame_encoding,current_frame_type); 
+ render_packedsequence();
+ render_packedpicture();
+ out->flags = AVI_KEY_FRAME;
+ }
+ else 
+ {
+ out->flags = AVI_P_FRAME;
+ render_picture(current_frame_encoding,current_frame_type);
+ }
+ render_slice(current_frame_encoding,current_frame_type);
+ CHECK_VA_STATUS_BOOL( vaEndPicture(admLibVA::getDisplay(),context_id));
+ //-- 
+ 
+ CHECK_VA_STATUS_BOOL( vaSyncSurface(admLibVA::getDisplay(), vaSurface[current_frame_encoding % SURFACE_NUM]->surface));
+ 
+ out->len=vaEncodingBuffers[current_frame_encoding % SURFACE_NUM]->read(out->data, out->bufferSize);
+ ADM_assert(out->len>=0);
+
+ /* reload a new frame data */
+
+ update_ReferenceFrames(current_frame_type); 
+ current_frame_encoding++;
+ out->pts=in->Pts;
+ out->dts=out->pts;
+ return true;
+}
+
+ADM_vaEncodingContextH264AnnexB::ADM_vaEncodingContextH264AnnexB()
+{
+ 
+}
+ADM_vaEncodingContextH264AnnexB::~ADM_vaEncodingContextH264AnnexB()
+{
+ 
+}
+
+/**
+ * 
+ * @param width
+ * @param height
+ * @param knownSurfaces
+ * @return 
+ */
+bool ADM_vaEncodingContextH264AnnexB::setup( int width, int height, int frameInc,std::vector<ADM_vaSurface *>knownSurfaces)
+{
+ ADM_info("vaH264 setup\n");
+ 
+ h264=vaGetH264EncoderProfile();
+ if(h264->profile==VAProfileNone)
+ {
+ ADM_error("No H264 encoding support\n");
+ return false;
+ }
+ 
+ 
+ VAStatus va_status;
+ frame_width=width;
+ frame_height=height;
+ frame_width_mbaligned=(width+15)&~15;
+ frame_height_mbaligned=(height+15)&~15;
+ int i;
+ usSecondsToFrac(frameInc,&frameNum,&frameDen); 
+ ADM_info("xFps : %d : %d\n",frameNum,frameDen);
+ // marshall new config...
+ 
+ // copy common part
+ int nAttrib=h264->newAttributes.count();
+ VAConfigAttrib *ttrib=new VAConfigAttrib[nAttrib+1];
+ const VAConfigAttrib *old=h264->newAttributes.getPointer();
+ memcpy(ttrib,old,nAttrib*sizeof(VAConfigAttrib));
+ 
+ // add rate control, it is per instance
+ ttrib[nAttrib].type=VAConfigAttribRateControl;
+ ttrib[nAttrib].value=VA_RC_CBR;
+ 
+ 
+ CHECK_VA_STATUS_BOOL( vaCreateConfig(admLibVA::getDisplay(), h264->profile, VAEntrypointEncSlice, ttrib, nAttrib+1, &config_id));
+ 
+
+ int n=knownSurfaces.size(); 
+ VASurfaceID *tmp_surfaceId = new VASurfaceID[n];
+ for(int i=0;i<n;i++)
+ {
+ tmp_surfaceId[i]=knownSurfaces[i]->surface;
+ }
+
+ /* Create a context for this encode pipe */
+ CHECK_VA_STATUS_BOOL( vaCreateContext(admLibVA::getDisplay(), config_id,
+ frame_width_mbaligned, frame_height_mbaligned,
+ VA_PROGRESSIVE,
+ tmp_surfaceId, n,
+ &context_id));
+ 
+ delete [] ttrib;
+ delete [] tmp_surfaceId;
+ tmp_surfaceId=NULL;
+
+ int codedbuf_size = (frame_width_mbaligned * frame_height_mbaligned * 400) / (16*16);
+
+ for (i = 0; i < SURFACE_NUM; i++) 
+ {
+ vaEncodingBuffers[i]= ADM_vaEncodingBuffers::allocate(context_id,codedbuf_size);
+ if(!vaEncodingBuffers[i])
+ {
+ ADM_warning("Cannot create encoding buffer %d\n",i);
+ return false;;
+ }
+ }
+
+ // Allocate VAImage
+
+ for(int i=0;i<VA_ENC_NB_SURFACE;i++)
+ {
+ vaSurface[i]=ADM_vaSurface::allocateWithSurface(width,height);
+ if(!vaSurface[i]) 
+ {
+ ADM_warning("Cannot allocate surface\n");
+ return false;
+ }
+
+ vaRefSurface[i]=ADM_vaSurface::allocateWithSurface(width,height);
+ if(!vaRefSurface[i]) 
+ {
+ ADM_warning("Cannot allocate ref surface\n");
+ return false;
+ }
+ }
+ tmpBuffer=new uint8_t[codedbuf_size];
+ render_sequence();
+ ADM_info("/vaH264 setup\n");
+ return true; 
+}
+
+// EOF
\ No newline at end of file

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libVaEncodingContextH264_render.cpp Added

@@ -0,0 +1,444 @@
+/***************************************************************************
+ \fn libvaEnc_plugin
+ \brief Plugin to use libva hw encoder (intel mostly)
+ -------------------
+
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+/***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_bitstream.h"
+#include "va/va.h"
+#include "va/va_enc_h264.h"
+#include "ADM_coreLibVA_buffer.h"
+#include "ADM_libVaEncodingContextH264.h"
+
+
+
+#define partition(ref, field, key, ascending) \
+ while (i <= j) { \
+ if (ascending) { \
+ while (ref[i].field < key) \
+ i++; \
+ while (ref[j].field > key) \
+ j--; \
+ } else { \
+ while (ref[i].field > key) \
+ i++; \
+ while (ref[j].field < key) \
+ j--; \
+ } \
+ if (i <= j) { \
+ tmp = ref[i]; \
+ ref[i] = ref[j]; \
+ ref[j] = tmp; \
+ i++; \
+ j--; \
+ } \
+ } \
+
+
+/**
+ * 
+ * @param ref
+ * @param left
+ * @param right
+ * @param ascending
+ * @param frame_idx
+ */
+static void sort_one(VAPictureH264 ref[], int left, int right,
+ int ascending, int frame_idx)
+{
+ int i = left, j = right;
+ unsigned int key;
+ VAPictureH264 tmp;
+
+ if (frame_idx)
+ {
+ key = ref[(left + right) / 2].frame_idx;
+ partition(ref, frame_idx, key, ascending);
+ }
+ else
+ {
+ key = ref[(left + right) / 2].TopFieldOrderCnt;
+ partition(ref, TopFieldOrderCnt, (signed int) key, ascending);
+ }
+
+ /* recursion */
+ if (left < j)
+ sort_one(ref, left, j, ascending, frame_idx);
+
+ if (i < right)
+ sort_one(ref, i, right, ascending, frame_idx);
+}
+
+/**
+ * 
+ * @param ref
+ * @param left
+ * @param right
+ * @param key
+ * @param frame_idx
+ * @param partition_ascending
+ * @param list0_ascending
+ * @param list1_ascending
+ */
+static void sort_two(VAPictureH264 ref[], int left, int right, unsigned int key, unsigned int frame_idx,
+ int partition_ascending, int list0_ascending, int list1_ascending)
+{
+ int i = left, j = right;
+ VAPictureH264 tmp;
+
+ if (frame_idx)
+ {
+ partition(ref, frame_idx, key, partition_ascending);
+ }
+ else
+ {
+ partition(ref, TopFieldOrderCnt, (signed int) key, partition_ascending);
+ }
+
+
+ sort_one(ref, left, i - 1, list0_ascending, frame_idx);
+ sort_one(ref, j + 1, right, list1_ascending, frame_idx);
+}
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264Base::update_ReferenceFrames(vaFrameType frameType)
+{
+ if (frameType == FRAME_B) 
+ return true;
+
+ CurrentCurrPic.flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
+ numShortTerm++;
+ if (numShortTerm > num_ref_frames)
+ numShortTerm = num_ref_frames; 
+ for (int i = numShortTerm - 1; i > 0; i--)
+ ReferenceFrames[i] = ReferenceFrames[i - 1];
+ ReferenceFrames[0] = CurrentCurrPic;
+ return true;
+}
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264Base::update_RefPicList(vaFrameType frameType)
+{ 
+ unsigned int current_poc = CurrentCurrPic.TopFieldOrderCnt;
+ switch(frameType)
+ {
+ case FRAME_P:
+ memcpy(RefPicList0_P, ReferenceFrames, numShortTerm * sizeof (VAPictureH264));
+ sort_one(RefPicList0_P, 0, numShortTerm - 1, 0, 1);
+ break;
+ case FRAME_B:
+ memcpy(RefPicList0_B, ReferenceFrames, numShortTerm * sizeof (VAPictureH264));
+ sort_two(RefPicList0_B, 0, numShortTerm - 1, current_poc, 0, 1, 0, 1);
+
+ memcpy(RefPicList1_B, ReferenceFrames, numShortTerm * sizeof (VAPictureH264));
+ sort_two(RefPicList1_B, 0, numShortTerm - 1, current_poc, 0, 0, 1, 0);
+ break;
+ default:
+ break;
+ }
+ return true;
+}
+
+void ADM_vaEncodingContextH264Base::fillSeqParam()
+{
+ seq_param.level_idc = 41 /*SH_LEVEL_3*/;
+ seq_param.picture_width_in_mbs = frame_width_mbaligned / 16;
+ seq_param.picture_height_in_mbs = frame_height_mbaligned / 16;
+ seq_param.bits_per_second = VA_BITRATE;
+ 
+#warning fixme
+ seq_param.intra_idr_period = vaH264Settings.IntraPeriod;
+ seq_param.ip_period = 10000;
+#warning fixme too
+ seq_param.max_num_ref_frames = 16; //num_ref_frames; // WTF ?
+ seq_param.seq_fields.bits.frame_mbs_only_flag = 1;
+ // FRAMERATE
+ seq_param.time_scale = frameDen;
+ seq_param.num_units_in_tick = frameNum; /* Tc = num_units_in_tick / time_sacle */
+ //
+ seq_param.seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4 = Log2MaxPicOrderCntLsb - 4;
+ seq_param.seq_fields.bits.log2_max_frame_num_minus4 = Log2MaxFrameNum - 4;
+ seq_param.seq_fields.bits.frame_mbs_only_flag = 1;
+ seq_param.seq_fields.bits.chroma_format_idc = 1;
+ seq_param.seq_fields.bits.direct_8x8_inference_flag = 1;
+ // PAN / SCAN
+ if (frame_width != frame_width_mbaligned ||
+ frame_height != frame_height_mbaligned)
+ {
+ seq_param.frame_cropping_flag = 1;
+ seq_param.frame_crop_left_offset = 0;
+ seq_param.frame_crop_right_offset = (frame_width_mbaligned - frame_width) / 2;
+ seq_param.frame_crop_top_offset = 0;
+ seq_param.frame_crop_bottom_offset = (frame_height_mbaligned - frame_height) / 2;
+ }
+}
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264Base::render_sequence(void)
+{
+ VABufferID seq_param_buf, rc_param_buf, misc_param_tmpbuf, render_id[2];
+ VAStatus va_status;
+ VAEncMiscParameterBuffer *misc_param, *misc_param_tmp;
+ VAEncMiscParameterRateControl *misc_rate_ctrl;
+
+ fillSeqParam();
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(), context_id,
+ VAEncSequenceParameterBufferType,
+ sizeof (seq_param), 1, &seq_param, &seq_param_buf));
+
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(), context_id,
+ VAEncMiscParameterBufferType,
+ sizeof (VAEncMiscParameterBuffer) + sizeof (VAEncMiscParameterRateControl),
+ 1, NULL, &rc_param_buf));
+
+
+ vaMapBuffer(admLibVA::getDisplay(), rc_param_buf, (void **) &misc_param);
+ misc_param->type = VAEncMiscParameterTypeRateControl;
+ misc_rate_ctrl = (VAEncMiscParameterRateControl *) misc_param->data;
+ memset(misc_rate_ctrl, 0, sizeof (*misc_rate_ctrl));
+ misc_rate_ctrl->bits_per_second = VA_BITRATE;
+ misc_rate_ctrl->target_percentage = 95;
+ misc_rate_ctrl->window_size = 1000;
+ misc_rate_ctrl->initial_qp = initial_qp;
+ misc_rate_ctrl->min_qp = minimal_qp;
+ misc_rate_ctrl->basic_unit_size = 0;
+ vaUnmapBuffer(admLibVA::getDisplay(), rc_param_buf);
+ render_id[0] = seq_param_buf;
+ render_id[1] = rc_param_buf;
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, &render_id[0], 2));
+ return true;
+}
+
+/**
+ * 
+ * @param pic_order_cnt_lsb
+ * @return 
+ */
+int ADM_vaEncodingContextH264Base::calc_poc(int pic_order_cnt_lsb,vaFrameType frameType)
+{
+ static int PicOrderCntMsb_ref = 0, pic_order_cnt_lsb_ref = 0;
+ int prevPicOrderCntMsb, prevPicOrderCntLsb;
+ int PicOrderCntMsb, TopFieldOrderCnt;
+
+ if (frameType == FRAME_IDR)
+ prevPicOrderCntMsb = prevPicOrderCntLsb = 0;
+ else
+ {
+ prevPicOrderCntMsb = PicOrderCntMsb_ref;
+ prevPicOrderCntLsb = pic_order_cnt_lsb_ref;
+ }
+
+ if ((pic_order_cnt_lsb < prevPicOrderCntLsb) &&
+ ((prevPicOrderCntLsb - pic_order_cnt_lsb) >= (int) (MaxPicOrderCntLsb / 2)))
+ PicOrderCntMsb = prevPicOrderCntMsb + MaxPicOrderCntLsb;
+ else if ((pic_order_cnt_lsb > prevPicOrderCntLsb) &&
+ ((pic_order_cnt_lsb - prevPicOrderCntLsb) > (int) (MaxPicOrderCntLsb / 2)))
+ PicOrderCntMsb = prevPicOrderCntMsb - MaxPicOrderCntLsb;
+ else
+ PicOrderCntMsb = prevPicOrderCntMsb;
+
+ TopFieldOrderCnt = PicOrderCntMsb + pic_order_cnt_lsb;
+
+ if (frameType != FRAME_B)
+ {
+ PicOrderCntMsb_ref = PicOrderCntMsb;
+ pic_order_cnt_lsb_ref = pic_order_cnt_lsb;
+ }
+
+ return TopFieldOrderCnt;
+}
+/**
+ * 
+ */
+void ADM_vaEncodingContextH264Base::fillPPS(int frameNumber, vaFrameType frameType)
+{
+ int current_slot = (frameNumber % SURFACE_NUM);
+ pic_param.CurrPic.picture_id = vaRefSurface[current_slot]->surface;
+ pic_param.CurrPic.frame_idx = frameNumber-gop_start;
+ pic_param.CurrPic.flags = 0;
+ pic_param.CurrPic.TopFieldOrderCnt = calc_poc((frameNumber - gop_start) % MaxPicOrderCntLsb,frameType);
+ pic_param.CurrPic.BottomFieldOrderCnt = pic_param.CurrPic.TopFieldOrderCnt;
+ CurrentCurrPic = pic_param.CurrPic; 
+ 
+ if(frameType==FRAME_IDR)
+ {
+ numShortTerm = 0;
+ }
+ 
+ if(numShortTerm)
+ memcpy(pic_param.ReferenceFrames, ReferenceFrames, numShortTerm * sizeof (VAPictureH264));
+ for (int i = numShortTerm; i < SURFACE_NUM; i++)
+ {
+ pic_param.ReferenceFrames[i].picture_id = VA_INVALID_SURFACE;
+ pic_param.ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ pic_param.pic_fields.bits.idr_pic_flag = (frameType == FRAME_IDR);
+ pic_param.pic_fields.bits.reference_pic_flag = (frameType != FRAME_B);
+ pic_param.pic_fields.bits.entropy_coding_mode_flag = 1;
+ pic_param.pic_fields.bits.deblocking_filter_control_present_flag = 1;
+ pic_param.frame_num = frameNumber-gop_start;
+ pic_param.coded_buf = vaEncodingBuffers[current_slot]->getId();
+ pic_param.last_picture = 0;
+ pic_param.pic_init_qp = initial_qp;
+}
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264Base::render_picture(int frameNumber,vaFrameType frameType)
+{
+ VABufferID pic_param_buf;
+ VAStatus va_status;
+ int i = 0;
+ fillPPS(frameNumber,frameType);
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(), context_id, VAEncPictureParameterBufferType,
+ sizeof (pic_param), 1, &pic_param, &pic_param_buf));
+
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, &pic_param_buf, 1));
+ return true;
+}
+
+
+
+
+//--
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_vaEncodingContextH264Base::render_slice(int frameNumber,vaFrameType frameType)
+{
+ VABufferID slice_param_buf;
+ VAStatus va_status;
+ int i;
+
+ update_RefPicList(frameType);
+
+ /* one frame, one slice */
+ slice_param.macroblock_address = 0;
+ slice_param.num_macroblocks = frame_width_mbaligned * frame_height_mbaligned / (16 * 16); /* Measured by MB */
+ switch(frameType) 
+ {
+ case FRAME_IDR:
+ slice_param.slice_type =SLICE_TYPE_I;
+ if (frameNumber) 
+ slice_param.idr_pic_id++;
+ for (i = 0; i < 32; i++)
+ {
+ slice_param.RefPicList0[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ slice_param.RefPicList1[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList1[i].flags = VA_PICTURE_H264_INVALID;
+ 
+ } 
+ break;
+ case FRAME_P: 
+ {
+ slice_param.slice_type=SLICE_TYPE_P;
+ int refpiclist0_max = h264->h264_maxref_p0;
+ memcpy(slice_param.RefPicList0, RefPicList0_P, refpiclist0_max * sizeof (VAPictureH264));
+ for (i = refpiclist0_max; i < 32; i++)
+ {
+ slice_param.RefPicList0[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ }
+ }
+ break;
+ case FRAME_B:
+ {
+ slice_param.slice_type=SLICE_TYPE_B;
+ int refpiclist0_max = h264->h264_maxref_p0;
+ int refpiclist1_max = h264->h264_maxref_p1;
+
+ memcpy(slice_param.RefPicList0, RefPicList0_B, refpiclist0_max * sizeof (VAPictureH264));
+ for (i = refpiclist0_max; i < 32; i++)
+ {
+ slice_param.RefPicList0[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ memcpy(slice_param.RefPicList1, RefPicList1_B, refpiclist1_max * sizeof (VAPictureH264));
+ for (i = refpiclist1_max; i < 32; i++)
+ {
+ slice_param.RefPicList1[i].picture_id = VA_INVALID_SURFACE;
+ slice_param.RefPicList1[i].flags = VA_PICTURE_H264_INVALID;
+ }
+ }
+ break;
+ default:
+ ADM_assert(0);
+ break;
+ }
+ 
+ slice_param.slice_alpha_c0_offset_div2 = 0;
+ slice_param.slice_beta_offset_div2 = 0;
+ slice_param.direct_spatial_mv_pred_flag = 1;
+ slice_param.pic_order_cnt_lsb = (frameNumber - gop_start) % MaxPicOrderCntLsb;
+
+ 
+ 
+
+ CHECK_VA_STATUS_BOOL(vaCreateBuffer(admLibVA::getDisplay(), context_id, VAEncSliceParameterBufferType,
+ sizeof (slice_param), 1, &slice_param, &slice_param_buf));
+ CHECK_VA_STATUS_BOOL(vaRenderPicture(admLibVA::getDisplay(), context_id, &slice_param_buf, 1));
+ return true;
+}
+
+// EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp Changed

@@ -3,10 +3,33 @@
 \brief Internal handling of video encoders
 -------------------
 
- copyright : (C) 2002/2009 by mean
+ copyright : (C) 2018 by mean
 email : fixounet@free.fr
 ***************************************************************************/
-
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 /***************************************************************************
 * *
 * This program is free software; you can redistribute it and/or modify *
@@ -16,76 +39,88 @@
 * *
 ***************************************************************************/
 #include "ADM_default.h"
+
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+
+
 #include "ADM_libvaEncoder.h"
+#include "va/va.h"
+#include "va/va_enc_h264.h"
+#include "ADM_coreLibVA_buffer.h"
+#include "vaDefines.h"
+#include "ADM_coreLibVA_encodingContext.h"
+#include "ADM_libVaEncodingContextH264.h"
 
 /**
 \fn ADM_libvaEncoder
 */
 ADM_libvaEncoder::ADM_libvaEncoder(ADM_coreVideoFilter *src,bool globalHeader) : ADM_coreVideoEncoder(src)
 {
- printf("[LibVAEncoder] Creating.\n");
- int w,h;
- FilterInfo *info=src->getInfo();
- w=info->width;
- h=info->height;
- image=new ADMImageDefault(w,h);
- plane=(w*h*3)/2;
- for(int i=0;i<VA_ENC_NB_SURFACE;i++) 
- vaSurface[i]=NULL;
- context=NULL;
- encodingBuffer=NULL;
- 
-
+ ADM_info("[LibVAEncoder] Creating, globalHeader=%d.\n",globalHeader);
+ image=new ADMImageDefault(getWidth(),getHeight());
+ vaContext=NULL;
+ extraDataSize=0;
+ extraData=NULL;
+ this->globalHeader=globalHeader;
 }
+/**
+ * 
+ * @return 
+ */
 bool ADM_libvaEncoder::setup(void)
 {
- int width=getWidth();
- int height=getHeight();
- 
- // Allocate VAImage
-
- for(int i=0;i<VA_ENC_NB_SURFACE;i++)
+ ADM_info("[LibVAEncoder] Setting up.\n");
+ int w=getWidth(),h=getHeight();
+ std::vector<ADM_vaSurface *>xNone;
+#if 0
+ vaContext= ADM_vaEncodingContext::allocate(0,w,h,getFrameIncrement(),xNone);
+ if(!vaContext) 
+ return false;
+#else
+ // Allocate a new one
+ ADM_vaEncodingContextH264Base *ctx;
+ if(globalHeader)
 {
- vaSurface[i]=ADM_vaSurface::allocateWithSurface(width,height);
- if(!vaSurface[i]) 
- {
- ADM_warning("Cannot allocate surface\n");
- return false;
- }
+ ctx=new ADM_vaEncodingContextH264Base;
+ }else
+ {
+ ctx=new ADM_vaEncodingContextH264AnnexB;
 }
- context=new ADM_vaEncodingContext();
- if(!context->init(width,height,VA_ENC_NB_SURFACE,vaSurface))
+ if(!ctx->setup(w, h, getFrameIncrement(), xNone))
 {
- ADM_warning("Cannot initialize vaEncoder context\n");
+ delete ctx;
+ ctx=NULL; 
 return false;
 }
- encodingBuffer=new ADM_vaEncodingBuffer(context,(width*height*400)/256);
+ vaContext=ctx;
+#endif
+ 
+ vaContext->generateExtraData(&(this->extraDataSize),&(this->extraData));
 return true;
 }
+
+ 
 /** 
 \fn ~ADM_libvaEncoder
 */
 ADM_libvaEncoder::~ADM_libvaEncoder()
 {
 ADM_info("[LibVAEncoder] Destroying.\n");
- for(int i=0;i<VA_ENC_NB_SURFACE;i++)
- {
- if(vaSurface[i])
- {
- delete vaSurface[i];
- vaSurface[i]=NULL;
- }
- }
- if(context)
+ if(vaContext)
 {
- delete context;
- context=NULL;
+ delete vaContext;
+ vaContext=NULL;
 }
- if(encodingBuffer)
+ if(extraData)
 {
- delete encodingBuffer;
- encodingBuffer=NULL;
+ delete [] extraData;
+ extraData=NULL;
 }
+ 
 }
 
 
@@ -95,27 +130,25 @@
 bool ADM_libvaEncoder::encode (ADMBitstream * out)
 {
 uint32_t fn;
+ aprintf("[LibVAEncoder] Encoding.\n");
+ 
 if(source->getNextFrame(&fn,image)==false)
 {
 ADM_warning("[LIBVA] Cannot get next image\n");
 return false;
 }
- if(!vaSurface[0]->fromAdmImage(image))
- {
- ADM_warning("Cannot upload image to surface\n");
- return false;
- }
- //
- if(!context->encode(vaSurface[0],out,encodingBuffer))
- {
- ADM_warning("Error encoding picture\n");
- return false;
- }
- 
- out->len=plane;
- out->pts=out->dts=image->Pts;
- out->flags=AVI_KEY_FRAME;
+ bool r=vaContext->encode(image,out);
+ aprintf("Encoding frame %d, result = %d, size=%d\n",fn,r,out->len);
+ return r;
+}
+
+bool ADM_libvaEncoder::getExtraData(uint32_t *l,uint8_t **d)
+{
+ *l=extraDataSize;
+ *d=extraData;
 return true;
 }
 
-// EOF
+
+
+// EOF
\ No newline at end of file

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h Changed

@@ -18,8 +18,8 @@
 #pragma once
 #include "ADM_coreVideoEncoder.h"
 #include "ADM_coreLibVA/ADM_coreLibVA.h"
+#include "ADM_coreLibVA_encodingContext.h"
 
-#define VA_ENC_NB_SURFACE 1 // ???
 /**
         \class ADM_libvaEncoder
         \brief Dummy encoder that does nothing
@@ -28,10 +28,7 @@
 class ADM_libvaEncoder : public ADM_coreVideoEncoder
 {
 protected:
-               int plane;
-               ADM_vaSurface            *vaSurface[VA_ENC_NB_SURFACE];
-               ADM_vaEncodingContext    *context;
-               ADM_vaEncodingBuffer     *encodingBuffer;
+               ADM_vaEncodingContext     *vaContext;
 public:
 
                             ADM_libvaEncoder(ADM_coreVideoFilter *src,bool globalHeader);
@@ -39,6 +36,15 @@
 virtual        bool         encode (ADMBitstream * out);
 virtual const  char         *getFourcc(void) {return "H264";}
 virtual        bool         setup(void);
+virtual        bool         getExtraData(uint32_t *l,uint8_t **d);
+
+protected:
+                int         extraDataSize;
+                uint8_t     *extraData;
+                bool        globalHeader;
+
+
+
 };

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder_debug.h Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/CMakeLists.txt Changed

@@ -1,12 +1,20 @@
-INCLUDE(ve_plugin)
-
-SET(LIBVA_SRCS 
-        libvaencPlugin.cpp
-        ADM_libvaEncoder.cpp
-)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-
-ADD_VIDEO_ENCODER(ADM_ve_libva  ${LIBVA_SRCS})
-TARGET_LINK_LIBRARIES(ADM_ve_libva ADM_coreLibVA6)
-INIT_VIDEO_ENCODER(ADM_ve_libva)
-INSTALL_VIDEO_ENCODER(ADM_ve_libva)
+INCLUDE(ve_plugin)
+#
+include(admCheckLibVA)
+checkLibVA()
+include_directories(${ADM_HEADER_DIR}/ADM_coreLibVA)        
+include_directories(${ADM_HEADER_DIR}/ADM_coreLibVAEnc/)
+ADD_VIDEO_ENCODER(ADM_ve_libva  
+                libvaencPlugin.cpp 
+                ADM_libVaEncodingContextH264_misc.cpp
+                ADM_libVaEncodingContextH264_render.cpp
+                ADM_libVaEncodingContextH264_packed.cpp
+                ADM_libvaEncoder.cpp  
+                ADM_libVaEncodingContextH264.cpp
+                    )
+
+TARGET_LINK_LIBRARIES(ADM_ve_libva ADM_coreLibVAEnc6 ADM_coreLibVA6 va)
+INIT_VIDEO_ENCODER(ADM_ve_libva)
+INSTALL_VIDEO_ENCODER(ADM_ve_libva)
+SET(ADM_vf_logo_SRCS ADM_vidLogo.cpp)
+

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/admPackage.txt Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp Changed

@@ -1,9 +1,9 @@
 /***************************************************************************
-                          \fn     yv12Plugin
-                          \brief  Plugin for YV12 dummy encoder
+                          \fn     libvaEnc_plugin
+                          \brief  Plugin to use libva hw encoder (intel mostly)
                              -------------------
 
-    copyright            : (C) 2002/2009 by mean
+    copyright            : (C) 2018 by mean
     email                : fixounet@free.fr
  ***************************************************************************/
 
@@ -18,18 +18,62 @@
 #include "ADM_default.h"
 #include "ADM_libvaEncoder.h"
 #include "ADM_coreVideoEncoderInternal.h"
+#include "DIA_factory.h"
+#include "ADM_coreLibVA_h264Encoding.h"
 
-void resetConfigurationData() {}
+#include "vaenc_settings.h"
+extern "C"
+{
+#include "vaenc_settings_desc.cpp"
+}
+extern bool     vaEncConfigure(void);
+ static const  vaconf_settings defaultConf = {10*1000,100};
+vaconf_settings vaH264Settings=defaultConf;
+/**
+ * 
+ */
+void resetConfigurationData()
+{  
+    memcpy(&vaH264Settings, &defaultConf, sizeof(vaH264Settings));
+}
 
+/**
+ * 
+ * @return 
+ */
+static bool         ADM_libvaEncoder_probe()
+{
+    VAProfile profile=vaGetH264EncoderProfile()->profile;
+    if(profile==VAProfileNone)
+    {
+        ADM_error("No H264 encoding support\n");
+        return false;
+    }    
+    return true;
+} 
 ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_libvaEncoder);
-ADM_DECLARE_VIDEO_ENCODER_MAIN("LibVaEncoder (HW)",
-                               "Mpeg4 AVC (VA/HW)",
-                               "Simple Libva Encoder (c) 2013 Mean",
-                                NULL, // No configuration
+ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("LibVaEncoder (HW)",
+                               "Intel AVC HW (VA)",
+                               "Simple Libva Encoder (c) 2018 Mean",
+                                vaEncConfigure, // No configuration
                                 ADM_UI_ALL,
                                 1,0,0,
-                                NULL, // conf template
-                                NULL, // conf var
-                                NULL,NULL
+                                vaconf_settings_param, // conf template
+                                &vaH264Settings, // conf var
+                                NULL,NULL ,       // setProfile,getProfile)
+                                ADM_libvaEncoder_probe                                  
 );
+/**
+ * 
+ * @return 
+ */
+bool vaEncConfigure(void)
+{
 
+    diaElemUInteger  period(&(vaH264Settings.IntraPeriod),QT_TRANSLATE_NOOP("vaH264","_IDR Period:"),1,1000);
+    diaElemUInteger  bitrate(&(vaH264Settings.BitrateKbps),QT_TRANSLATE_NOOP("vaH264","_Bitrate(kbps)"),1,100*1000);
+
+    diaElem *elems[2]={&bitrate,&period};    
+    return diaFactoryRun(QT_TRANSLATE_NOOP("vaEncH264","vaH264 Configuration"),2 ,elems);
+}
+// EOF
\ No newline at end of file

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/vaDefines.h Added

@@ -0,0 +1,88 @@
+/***************************************************************************
+                          \fn     libvaEnc_plugin
+                          \brief  Plugin to use libva hw encoder (intel mostly)
+                             -------------------
+
+    copyright            : (C) 2018 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ /***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+/**
+ */
+#define SURFACE_NUM 16
+
+enum vaFrameType
+{
+    FRAME_P=0,
+    FRAME_B=1,
+    FRAME_I=2,
+    FRAME_IDR=7
+};
+/**
+ */
+enum vaSliceType
+{
+ SLICE_TYPE_P    =        0,
+ SLICE_TYPE_B    =        1,
+ SLICE_TYPE_I    =        2,
+};
+#define IS_P_SLICE(type) (SLICE_TYPE_P == (type))
+#define IS_B_SLICE(type) (SLICE_TYPE_B == (type))
+#define IS_I_SLICE(type) (SLICE_TYPE_I == (type))
+
+#define NAL_REF_IDC_NONE        0
+#define NAL_REF_IDC_LOW         1
+#define NAL_REF_IDC_MEDIUM      2
+#define NAL_REF_IDC_HIGH        3
+
+
+
+
+#define PROFILE_IDC_BASELINE    66
+#define PROFILE_IDC_MAIN        77
+#define PROFILE_IDC_HIGH        100
+   
+
+

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings.conf Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings.h Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings_desc.cpp Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/vaenc_settings_json.cpp Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp Changed

@@ -42,7 +42,7 @@
 //targetColorSpace=ADM_COLOR_YUV422P;
 ADM_info("[ffNvEncEncoder] Creating.\n");
 nv12=NULL;
-
+ frameIncrement=src->getInfo()->frameIncrement;
 
 }
 
@@ -60,11 +60,26 @@
 MIAOU(LL,"ll") 
 MIAOU(LLHP,"llhp") 
 MIAOU(LLHQ,"llhq") 
- MIAOU(HQ,"hq") 
+ MIAOU(HQ,"hq")
 default:break;
- }
+#undef MIAOU
+ };
+
+ switch(NvEncSettings.profile)
+ {
+#define MIAOU(x,y) case NV_FF_PROFILE_##x: ADM_assert(!av_opt_set(_context->priv_data,"profile",y,0)); break;
+
+ MIAOU(BASELINE,"baseline")
+ MIAOU(MAIN,"main")
+ MIAOU(HIGH,"high")
+ default:break;
+#undef MIAOU
+ };
+
 _context->bit_rate=NvEncSettings.bitrate*1000;
 _context->rc_max_rate=NvEncSettings.max_bitrate*1000;
+ _context->gop_size=NvEncSettings.gopsize;
+ _context->max_b_frames=NvEncSettings.bframes;
 #ifdef USE_NV12 
 _context->pix_fmt= AV_PIX_FMT_NV12; 
 #else 
@@ -100,6 +115,16 @@
 return true;
 }
 
+/**
+ \fn getEncoderDelay
+*/
+uint64_t ADM_ffNvEncEncoder::getEncoderDelay(void)
+{
+ uint64_t delay=0;
+ if(NvEncSettings.bframes)
+ delay=frameIncrement*2;
+ return delay;
+}
 
 /**
 \fn ~ADM_ffNvEncEncoder
@@ -128,7 +153,8 @@
 sz=encodeWrapper(NULL,out);
 if (sz<= 0)
 {
- ADM_info("[ffnvenc] Error %d encoding video\n",sz);
+ if(sz<0)
+ ADM_info("[ffnvenc] Error %d encoding video\n",sz);
 return false;
 }
 ADM_info("[ffnvenc] Popping delayed bframes (%d)\n",sz);
@@ -197,17 +223,33 @@
 {NV_FF_PRESET_LLHQ,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (HQ)")}
 };
 
+diaMenuEntry meProfile[]={
+ {NV_FF_PROFILE_BASELINE,QT_TRANSLATE_NOOP("ffnvenc","Baseline")},
+ {NV_FF_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffnvenc","Main")},
+ {NV_FF_PROFILE_HIGH,QT_TRANSLATE_NOOP("ffnvenc","High")}
+};
+
 ffnvenc_encoder *conf=&NvEncSettings;
 
 #define PX(x) &(conf->x)
 
- diaElemMenu qzPreset(PX(preset),QT_TRANSLATE_NOOP("ffnvenc","Preset:"),6,mePreset); 
+ diaElemMenu qzPreset(PX(preset),QT_TRANSLATE_NOOP("ffnvenc","Preset:"),6,mePreset);
+ diaElemMenu profile(PX(profile),QT_TRANSLATE_NOOP("ffnvenc","Profile:"),3,meProfile);
 diaElemUInteger bitrate(PX(bitrate),QT_TRANSLATE_NOOP("ffnvenc","Bitrate (kbps):"),1,50000);
 diaElemUInteger maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("ffnvenc","Max Bitrate (kbps):"),1,50000);
+ diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffnvenc","GOP Size:"),8,250);
+ diaElemUInteger maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffnvenc","Maximum Consecutive B-Frames:"),0,4);
+ diaElemFrame rateControl(QT_TRANSLATE_NOOP("ffnvenc","Rate Control"));
+ diaElemFrame frameControl(QT_TRANSLATE_NOOP("ffnvenc","Frame Control"));
+
+ rateControl.swallow(&bitrate);
+ rateControl.swallow(&maxBitrate);
+ frameControl.swallow(&gopSize);
+ frameControl.swallow(&maxBframes);
 /* First Tab : encoding mode */
- diaElem *diamode[]={&qzPreset,&bitrate,&maxBitrate};
+ diaElem *diamode[]={&qzPreset,&profile,&rateControl,&frameControl};
 
- if( diaFactoryRun(QT_TRANSLATE_NOOP("ffnvenc","NVENC H.264 configuration"),3,diamode))
+ if( diaFactoryRun(QT_TRANSLATE_NOOP("ffnvenc","NVENC H.264 configuration"),4,diamode))
 {
 
 return true;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp Changed

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp Added

@@ -0,0 +1,187 @@
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_ffVTEnc.h"
+#undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
+#include "DIA_factory.h"
+#if 1
+#define aprintf(...) {}
+#else
+#define aprintf printf
+#endif
+
+extern "C"
+{
+ #include "libavutil/opt.h"
+}
+
+ffvtenc VTEncSettings = VT_ENC_CONF_DEFAULT;
+
+/**
+ \fn ADM_ffVTEncoder
+*/
+ADM_ffVTEncoder::ADM_ffVTEncoder(ADM_coreVideoFilter *src, bool globalHeader) : ADM_coreVideoEncoderFFmpeg(src, NULL, globalHeader)
+{
+ ADM_info("Creating VideoToolbox HW accelerated H.264 encoder...\n");
+ frameIncrement=src->getInfo()->frameIncrement;
+}
+
+/**
+ \fn configureContext
+*/
+bool ADM_ffVTEncoder::configureContext(void)
+{
+ switch(VTEncSettings.profile)
+ {
+#define SAY(x,y) case FF_VT_PROFILE_##x: ADM_assert(!av_opt_set(_context->priv_data,"profile",y,0)); break;
+ SAY(BASELINE,"baseline")
+ SAY(MAIN,"main")
+ SAY(HIGH,"high")
+ default:break;
+#undef SAY
+ };
+
+ _context->bit_rate=VTEncSettings.bitrate*1000;
+ _context->rc_max_rate=VTEncSettings.max_bitrate*1000;
+ _context->gop_size=VTEncSettings.gopsize;
+ _context->max_b_frames=VTEncSettings.bframes;
+ _context->pix_fmt=AV_PIX_FMT_YUV420P;
+
+ return true;
+}
+
+/**
+ \fn setup
+*/
+bool ADM_ffVTEncoder::setup(void)
+{
+ if(false== ADM_coreVideoEncoderFFmpeg::setupByName("h264_videotoolbox"))
+ {
+ ADM_info("[FFmpeg] Encoder setup failed\n");
+ return false;
+ }
+
+ ADM_info("[FFmpeg] Setup OK\n");
+
+ int w = getWidth();
+ int h = getHeight();
+ return true;
+}
+
+/**
+ \fn getEncoderDelay
+*/
+uint64_t ADM_ffVTEncoder::getEncoderDelay(void)
+{
+ uint64_t delay=0;
+ if(VTEncSettings.bframes)
+ delay=frameIncrement*2;
+ return delay;
+}
+
+/**
+ \fn dtor
+*/
+ADM_ffVTEncoder::~ADM_ffVTEncoder()
+{
+ ADM_info("[ffVTEncoder] Destroying\n");
+}
+
+/**
+ \fn encode
+*/
+bool ADM_ffVTEncoder::encode(ADMBitstream *out)
+{
+ int sz,q;
+again:
+ sz=0;
+ if(false==preEncode()) // Pop out the frames stored in the queue due to B-frames
+ {
+ sz=encodeWrapper(NULL,out);
+ if (sz<= 0)
+ {
+ ADM_info("[ffvtenc] Error %d encoding video\n",sz);
+ return false;
+ }
+ ADM_info("[ffvtenc] Popping delayed bframes (%d)\n",sz);
+ goto link;
+ return false;
+ }
+ q = image->_Qp;
+
+ if(!q) q=2;
+ aprintf("[CODEC] Flags = 0x%x, QSCALE=%x, bit_rate=%d, quality=%d qz=%d incoming qz=%d\n",_context->flags,CODEC_FLAG_QSCALE,
+ _context->bit_rate, _frame->quality, _frame->quality/ FF_QP2LAMBDA,q);
+
+ _frame->reordered_opaque = image->Pts;
+ _frame->width = image->GetWidth(PLANAR_Y);
+ _frame->height = image->GetHeight(PLANAR_Y);
+ _frame->format = AV_PIX_FMT_YUV420P;
+ sz=encodeWrapper(_frame,out);
+ if(sz<0)
+ {
+ ADM_warning("[ffvtenc] Error %d encoding video\n",sz);
+ return false;
+ }
+
+ if(sz==0) // no pic, probably pre filling, try again
+ goto again;
+link:
+ return postEncode(out,sz);
+}
+
+/**
+ \fn isDualPass
+
+*/
+bool ADM_ffVTEncoder::isDualPass(void)
+{
+ return false;
+}
+
+/**
+ \fn ffVTEncConfigure
+ \brief UI configuration for the h264_videotoolbox encoder
+*/
+
+bool ffVTEncConfigure(void)
+{
+ ffvtenc *conf=&VTEncSettings;
+
+ diaMenuEntry vtProfile[]={
+ {FF_VT_PROFILE_BASELINE,QT_TRANSLATE_NOOP("ffvtenc","Baseline")},
+ {FF_VT_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffvtenc","Main")},
+ {FF_VT_PROFILE_HIGH,QT_TRANSLATE_NOOP("ffvtenc","High")}
+};
+
+#define PX(x) &(conf->x)
+
+ diaElemMenu profile(PX(profile),QT_TRANSLATE_NOOP("ffvtenc","Profile:"),3,vtProfile);
+ diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffvtenc","GOP Size:"),1,250);
+ diaElemUInteger maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffvtenc","Maximum Consecutive B-Frames:"),0,1);
+ diaElemUInteger bitrate(PX(bitrate), QT_TRANSLATE_NOOP("ffvtenc","Bitrate (kbps):"),1,50000);
+ diaElemUInteger maxBitrate(PX(max_bitrate), QT_TRANSLATE_NOOP("ffvtenc","Max Bitrate (kbps):"),1,50000);
+ diaElemFrame rateControl(QT_TRANSLATE_NOOP("ffvtenc","Rate Control"));
+ diaElemFrame frameControl(QT_TRANSLATE_NOOP("ffvtenc","Frame Control"));
+
+ rateControl.swallow(&bitrate);
+ rateControl.swallow(&maxBitrate);
+ frameControl.swallow(&gopSize);
+ frameControl.swallow(&maxBframes);
+
+ diaElem *diamode[] = {&profile,&rateControl,&frameControl};
+
+ if( diaFactoryRun(QT_TRANSLATE_NOOP("ffvtenc","VideoToolbox H.264 Encoder Configuration"),3,diamode))
+ {
+ return true;
+ }
+ return false;
+}
+// EOF

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.h Added

@@ -0,0 +1,47 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_coreVideoEncoderFFmpeg.h"
+#include "ffvtenc.h"
+
+enum FF_VTEncProfile
+{
+    FF_VT_PROFILE_BASELINE=1,
+    FF_VT_PROFILE_MAIN=2,
+    FF_VT_PROFILE_HIGH=3
+};
+
+#define VT_ENC_CONF_DEFAULT \
+{ \
+    FF_VT_PROFILE_HIGH, \
+    100, \
+    0, \
+    2000, \
+    4000 \
+}
+
+/**
+        \class ADM_ffVTEncoder
+*/
+class ADM_ffVTEncoder : public ADM_coreVideoEncoderFFmpeg
+{
+protected:
+               uint64_t    frameIncrement;
+
+public:
+                           ADM_ffVTEncoder(ADM_coreVideoFilter *src, bool globalHeader);
+    virtual                ~ADM_ffVTEncoder();
+    virtual    bool        configureContext(void);
+    virtual    bool        setup(void);
+    virtual    bool        encode(ADMBitstream *out);
+    virtual const char     *getFourcc(void) { return "H264"; }
+    virtual    bool        isDualPass(void);
+    virtual    uint64_t    getEncoderDelay(void);
+};
+//EOF
\ No newline at end of file

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/CMakeLists.txt Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffVTEncPlugin.cpp Added

@@ -0,0 +1,51 @@
+/***************************************************************************
+                  \fn     ffVTEnc
+                  \brief  Front end for the h264_videotoolbox lav encoder
+                           -------------------
+
+    copyright            : (C) 2002/2016 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_coreVideoEncoderInternal.h"
+#include "ffvtenc.h"
+#include "ffvtenc_desc.cpp"
+#include "ADM_ffVTEnc.h"
+extern bool ffVTEncConfigure(void);
+extern ffvtenc VTEncSettings;
+
+void resetConfigurationData()
+{
+    ffvtenc defaultConf = VT_ENC_CONF_DEFAULT;
+    memcpy(&VTEncSettings, &defaultConf, sizeof(FFcodecSettings));
+}
+
+/**
+ *   \fn ffVTEncProbe
+ */
+static bool ffVTEncProbe(void)
+{
+    return true;
+}
+
+ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffVTEncoder);
+ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffVTEnc",
+                               "VideoToolbox H.264",
+                               "VideoToolbox H.264 HW Encoder",
+                                ffVTEncConfigure, // No configuration
+                                ADM_UI_ALL,
+                                1,0,0,
+                                ffvtenc_param, // conf template
+                                &VTEncSettings,NULL,NULL, // conf var
+                                ffVTEncProbe
+);

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc.conf Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc.h Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc_desc.cpp Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc_json.cpp Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp Changed

@@ -128,6 +128,8 @@
 connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));
 connect(ui.mbTreeCheckBox, SIGNAL(toggled(bool)), this, SLOT(mbTreeCheckBox_toggled(bool)));
 connect(ui.aqVarianceCheckBox, SIGNAL(toggled(bool)), this, SLOT(aqVarianceCheckBox_toggled(bool)));
+ connect(ui.trellisCheckBox, SIGNAL(toggled(bool)), this, SLOT(trellisCheckBox_toggled(bool)));
+ connect(ui.trellisComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(trellisComboBox_currentIndexChanged(int)));
 #if 0
 connect(ui.maxCrfSlider, SIGNAL(valueChanged(int)), this, SLOT(maxCrfSlider_valueChanged(int)));
 connect(ui.maxCrfSpinBox, SIGNAL(valueChanged(int)), this, SLOT(maxCrfSpinBox_valueChanged(int)));
@@ -672,7 +674,13 @@
 
 void x264Dialog::meSlider_valueChanged(int value)
 {
- ui.meSpinBox->setValue(value);
+ ui.meSpinBox->setValue(value);
+ if(value>9)
+ {
+ ui.aqVarianceCheckBox->setChecked(true);
+ ui.trellisCheckBox->setChecked(true);
+ ui.trellisComboBox->setCurrentIndex(1);
+ }
 }
 void x264Dialog::quantiserSpinBox_valueChanged(int value)
 {
@@ -718,11 +726,31 @@
 {
 QString st=QT_TRANSLATE_NOOP("x264","Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled. Macroblock-Tree optimisation will automatically be disabled.\n\nDo you wish to continue?");
 if (GUI_Question(st.toUtf8().constData()))
+ {
 ui.mbTreeCheckBox->setChecked(false);
- else
+ if(ui.meSpinBox->value()>9)
+ ui.meSpinBox->setValue(9);
+ }else
 ui.aqVarianceCheckBox->setChecked(true);
 }
 }
+
+void x264Dialog::trellisCheckBox_toggled(bool checked)
+{
+ if(!checked && ui.meSpinBox->value()>9)
+ {
+ ui.meSpinBox->setValue(9);
+ }
+}
+
+void x264Dialog::trellisComboBox_currentIndexChanged(int index)
+{
+ if(index<1 && ui.meSpinBox->value()>9)
+ {
+ ui.meSpinBox->setValue(9);
+ }
+}
+
 #if 0
 void x264Dialog::maxCrfSlider_valueChanged(int value)
 {

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp Changed

@@ -60,16 +60,16 @@
 #if X265_BUILD < 47
 switch(x265Settings.general.poolThreads)
 {
- case 0: case 1: case 2: param.poolNumThreads = x265Settings.general.poolThreads;break;
- case 99:break; //auto
+ case 1: case 2: case 4: param.poolNumThreads = x265Settings.general.poolThreads;break;
+ case 0: case 99: break; //auto
 default: ADM_error("UNKNOWN NB OF THREADS\n");break;
 }
 #endif
 
 switch(x265Settings.general.frameThreads)
 {
- case 0: case 1: case 2: param.frameNumThreads = x265Settings.general.frameThreads;break;
- case 99:break; //auto
+ case 1: case 2: case 4: param.frameNumThreads = x265Settings.general.frameThreads;break;
+ case 0: case 99: break; //auto
 default: ADM_error("UNKNOWN NB OF THREADS\n");break;
 }
 param.sourceWidth = getWidth();
@@ -213,6 +213,8 @@
 MKPARAM (noiseReduction,noise_reduction)
 #endif
 
+ MKPARAMB(bEnableStrongIntraSmoothing,strong_intra_smoothing)
+
 //---------------- ratecontrol -------------------
 #undef MKPARAM
 #undef MKPARAMD
@@ -280,7 +282,7 @@
 void dumpx265Setup(x265_param *param)
 {
 #define PI(x) printf(#x"\t:%d\n",(int)param->x)
-#define PD(x) printf(#x"\t:%d\n",(double)param->x)
+#define PD(x) printf(#x"\t:%f\n",(double)param->x)
 #define PS(x) printf(#x"\t:%s\n",param->x)
 printf("*************************************\n");
 printf("*** Encoder Environment ***\n");

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp Changed

@@ -144,15 +144,14 @@
     // Left
     blackenHz(param.left,image->_height,ptr,stride);
     // Right
-    uint32_t pWidth=previousFilter->getInfo()->width;
-    ptr[0]+=param.left+pWidth;
-    ptr[1]+=(param.left+pWidth)/2;
-    ptr[2]+=(param.left+pWidth)/2;
+    ptr[0]+=param.left+smallWidth;
+    ptr[1]+=(param.left+smallWidth)/2;
+    ptr[2]+=(param.left+smallWidth)/2;
     blackenHz(param.right,image->_height,ptr,stride);
     // Bottom
     image->GetPitches(stride);
     image->GetWritePlanes(ptr);
-    uint32_t offsetLine=previousFilter->getInfo()->height+param.top;
+    uint32_t offsetLine=smallHeight+param.top;
     ptr[0]+=offsetLine*stride[0];
     ptr[1]+=(offsetLine/2)*stride[1];
     ptr[2]+=(offsetLine/2)*stride[2];
@@ -179,10 +178,12 @@
           width=previousFilter->getInfo()->width;
           height=previousFilter->getInfo()->height;
 
-          diaElemUInteger dleft(&left,QT_TRANSLATE_NOOP("addBorder", "_Left border:"),       0,width);
-          diaElemUInteger dright(&right,QT_TRANSLATE_NOOP("addBorder", "_Right border:"),    0,width);
-          diaElemUInteger dtop(&(top),QT_TRANSLATE_NOOP("addBorder", "_Top border:"),          0,height);
-          diaElemUInteger dbottom(&(bottom),QT_TRANSLATE_NOOP("addBorder", "_Bottom border:"), 0,height);
+#define BORDER_MAX_WIDTH 2160
+
+          diaElemUInteger dleft(&left,QT_TRANSLATE_NOOP("addBorder", "_Left border:"),        0,BORDER_MAX_WIDTH);
+          diaElemUInteger dright(&right,QT_TRANSLATE_NOOP("addBorder", "_Right border:"),     0,BORDER_MAX_WIDTH);
+          diaElemUInteger dtop(&(top),QT_TRANSLATE_NOOP("addBorder", "_Top border:"),         0,BORDER_MAX_WIDTH);
+          diaElemUInteger dbottom(&(bottom),QT_TRANSLATE_NOOP("addBorder", "_Bottom border:"),0,BORDER_MAX_WIDTH);
 
           diaElem *elems[4]={&dleft,&dright,&dtop,&dbottom};
           if(diaFactoryRun(QT_TRANSLATE_NOOP("addBorder", "Add Borders"),4,elems))

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt Changed

@@ -1,10 +1,10 @@
 INCLUDE(admCheckFreeType)
-INCLUDE(admCheckFridibi)
+INCLUDE(admCheckFribidi)
 ADD_CORE_INCLUDE(ADM_coreSubtitles)
 checkFreeType()
-checkFridibi("0.19")
+checkFribidi("0.19")
 
-IF (USE_FREETYPE AND USE_FRIDIBI)
+IF (USE_FREETYPE AND USE_FRIBIDI)
     INCLUDE(vf_plugin)
     SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp)
 
@@ -13,10 +13,10 @@
     IF(DO_COMMON)
         IF(USE_EXTERNAL_LIBASS)
             ADD_DEFINITIONS("-DUSE_EXTERNAL_LIBASS")
-            TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle)
+            TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} ${FREETYPE2_LDFLAGS} ${FRIBIDI_LDFLAGS} ADM_coreSubtitle)
         ELSE(USE_EXTERNAL_LIBASS)
             ADD_SUBDIRECTORY(ADM_libass)
-            TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle)
+            TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIBIDI_LDFLAGS} ADM_coreSubtitle)
         ENDIF(USE_EXTERNAL_LIBASS)
         # We force the use of fontconfig
         ADD_DEFINITIONS("-DUSE_FONTCONFIG")
@@ -25,6 +25,6 @@
 
     INIT_VIDEO_FILTER(ADM_vf_ssa)
     INSTALL_VIDEO_FILTER(ADM_vf_ssa)
-ELSE (USE_FREETYPE AND USE_FRIDIBI)
-        MESSAGE(STATUS "Fribidi or feetype missing, skipping filter")
-ENDIF (USE_FREETYPE AND USE_FRIDIBI)
+ELSE (USE_FREETYPE AND USE_FRIBIDI)
+    MESSAGE(STATUS "Fribidi or feetype missing, skipping filter")
+ENDIF (USE_FREETYPE AND USE_FRIBIDI)

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp Changed

@@ -56,12 +56,23 @@
  */
 bool  AVDM_black::configure()
 {
-    
-        uint32_t mx=9*3600*1000;
-        diaElemTimeStamp start(&(param.startBlack),QT_TRANSLATE_NOOP("black","_Start time (ms):"),0,mx);
-        diaElemTimeStamp end(&(param.endBlack),QT_TRANSLATE_NOOP("black","_End time (ms):"),0,mx);
-        diaElem *elems[2]={&start,&end};
-        return diaFactoryRun(QT_TRANSLATE_NOOP("black","Replace by Black"),2+0*1,elems);
+    uint32_t mx=(uint32_t)(previousFilter->getInfo()->totalDuration/1000);
+
+    diaElemTimeStamp start(&(param.startBlack),QT_TRANSLATE_NOOP("black","_Start time:"),0,mx);
+    diaElemTimeStamp end(&(param.endBlack),QT_TRANSLATE_NOOP("black","_End time:"),0,mx);
+    diaElem *elems[2]={&start,&end};
+
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("black","Replace by Black"),2+0*1,elems))
+    {
+        if(param.startBlack > param.endBlack)
+        {
+            uint32_t tmp=param.startBlack;
+            param.startBlack=param.endBlack;
+            param.endBlack=tmp;
+        }
+        return true;
+    }
+    return false;
 }
 /**
  *      \fn getConfiguration
@@ -70,8 +81,8 @@
 const char   *AVDM_black::getConfiguration(void)
 {
         static char conf[1024];
-        std::string startTime=std::string(ADM_us2plain(param.startBlack*1000));
-        std::string endTime=std::string(ADM_us2plain(param.endBlack*1000));
+        std::string startTime=std::string(ADM_us2plain(param.startBlack*1000LL));
+        std::string endTime=std::string(ADM_us2plain(param.endBlack*1000LL));
 	snprintf(conf,255," Black : Start %s End %s",startTime.c_str(),endTime.c_str());
         return conf;
 }

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.cpp Changed

@@ -45,7 +45,7 @@
 *in++=0xff;
 
 *in++=0;
- *in++=0;
+ *in++=0xff;
 }
 }
 // bottom
@@ -59,7 +59,7 @@
 
 *in++=0xff;
 *in++=0;
- *in++=0;
+ *in++=0xff;
 }
 }
 // left
@@ -74,7 +74,7 @@
 
 *(in+4*x+1)=0xff;
 *(in+4*x+2)=0;
- *(in+4*x+3)=0;
+ *(in+4*x+3)=0xff;
 }
 for(x=0;x<right;x++)
 {
@@ -83,7 +83,7 @@
 
 *(in-4*x+stride-3)=0xff;
 *(in-4*x+stride-2)=0;
- *(in-4*x+stride-1)=0;
+ *(in-4*x+stride-1)=0xff;
 
 }
 in+=4*w;

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/cli/DIA_chromaShift.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/cli/DIA_chromaShift.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp Changed

@@ -48,20 +48,23 @@
 }
 
 /**
- \fn blank
- \brief 
-*/
+ * \fn blank
+ * \brief Green bars
+ */
 
-static void blank(uint8_t *in, int w,int h,int stride)
+static void blank(uint8_t *in, int w, int h, int stride)
 {
 for(int y=0;y<h;y++)
 {
 memset(in,0,4*w);
- uint8_t *p=in+1;
- for(int x=0;x<w;x++) 
- p[x<<2]=0xff; 
+ uint8_t *green=in+1;
+ for(int x=0;x<w;x++)
+ green[x<<2]=0xff;
+ uint8_t *alpha=in+3;
+ for(int x=0;x<w;x++)
+ alpha[x<<2]=0xff;
 in+=stride;
- } 
+ }
 }
 
 /**
@@ -70,14 +73,14 @@
 * @param imageOut
 * @return 
 */
-uint8_t flyCrop::processRgb(uint8_t *imageIn, uint8_t *imageOut)
+uint8_t flyCrop::processRgb(uint8_t *imageIn, uint8_t *imageOut)
 {
 memcpy(imageOut,imageIn,_w*_h*4);
- 
+
 blank(imageOut,_w,top,4*_w);
 blank(imageOut+(_w*4)*(_h-bottom),_w,bottom,4*_w);
 blank(imageOut,left,_h,4*_w);
- blank(imageOut+(_w-right-1)*4,right,_h,4*_w);
+ blank(imageOut+(_w-right)*4,right,_h,4*_w);
 return true;
 }
 /**
@@ -197,13 +200,13 @@
 y=y-1;
 return y&0xfffe;
 }
-int flyCrop::autoRunV(uint8_t *in,int w,int h, int increment)
+int flyCrop::autoRunV(uint8_t *in, int stride, int w, int increment)
 {
 uint32_t avg,eqt;
 int y;
- for(y=0;y<h;y++)	
+ for(y=0;y<w;y++)
 {
- MetricsV(in,w,h,&avg,&eqt);
+ MetricsV(in,stride,_h,&avg,&eqt);
 in+=increment;
 if(avg> THRESH_AVG || eqt > THRESH_EQT)
 break;
@@ -218,18 +221,14 @@
 */
 uint8_t flyCrop::autocrop(void)
 {
-uint8_t *in;
-uint32_t y,avg,eqt;
- // Top
-
-
+ uint8_t *in;
 in=_yuvBuffer->GetReadPtr(PLANAR_Y);
 int stride=_yuvBuffer->GetPitch(PLANAR_Y);
- 
+
 top=autoRun(in,_w,((_h>>1)-2),stride);
 bottom=autoRun(in+stride*(_h-1),_w,((_h>>1)-2),-stride);
- left=autoRunV(in,_w,((_w>>1)-2),1);
- right=autoRunV(in+_w-1,_w,((_w>>1)-2),-1);
+ left=autoRunV(in,stride,((_w>>1)-2),1);
+ right=autoRunV(in+_w-1,stride,((_w>>1)-2),-1);
 upload(false,true);
 sameImage();
 return 1;
@@ -251,6 +250,7 @@
 w->spinBoxRight->setValue(right);
 w->spinBoxTop->setValue(top);
 w->spinBoxBottom->setValue(bottom);
+ dimensions();
 
 if(toRubber)
 {
@@ -310,9 +310,24 @@
 rubber->nestedIgnore--;
 blockChanges(false);
 }
+ dimensions();
 return true;
 }
 
+/**
+ * \fn dimensions
+ * \brief Fill in label displaying video size
+ */
+void flyCrop::dimensions(void)
+{
+ Ui_cropDialog *w=(Ui_cropDialog *)_cookie;
+ QString dim=QString(QT_TRANSLATE_NOOP("crop","Size: "));
+ dim+=QString::number(_w-left-right);
+ dim+=QString(" x ");
+ dim+=QString::number(_h-top-bottom);
+ w->label_5->setText(dim);
+}
+
 //
 //	Video is in YV12 Colorspace
 //
@@ -334,12 +349,17 @@
 myCrop->right=param->right;
 myCrop->top=param->top;
 myCrop->bottom=param->bottom;
+ myCrop->rubber_is_hidden=param->rubber_is_hidden;
 myCrop->_cookie=&ui;
 myCrop->addControl(ui.toolboxLayout);
 myCrop->upload(false,true);
 myCrop->sliderChanged();
 
+ 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)));
 connect( ui.pushButtonAutoCrop,SIGNAL(clicked(bool)),this,SLOT(autoCrop(bool)));
 connect( ui.pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
 #define SPINNER(x) connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
@@ -348,6 +368,7 @@
 SPINNER(Top);
 SPINNER(Bottom);
 
+ setModal(true);
 show();
 myCrop->adjustCanvasPosition();
 canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
@@ -372,7 +393,8 @@
 param->right=myCrop->right;
 param->top=myCrop->top;
 param->bottom=myCrop->bottom;
- }
+ param->rubber_is_hidden=myCrop->rubber_is_hidden;
+}
 /**
 * 
 */
@@ -398,6 +420,17 @@
 lock--;
 }
 /**
+ * \fn toggleRubber
+ */
+void Ui_cropWindow::toggleRubber(int checkState)
+{
+ bool visible=true;
+ if(checkState)
+ visible=false;
+ myCrop->rubber->setVisible(visible);
+ myCrop->rubber_is_hidden=!visible;
+}
+/**
 * 
 * @param f
 */

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui Changed

@@ -6,7 +6,7 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>507</width>
+ <width>600</width>
 <height>300</height>
 </rect>
 </property>
@@ -46,29 +46,15 @@
 <property name="spacing">
 <number>6</number>
 </property>
- <item row="0" column="3">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Right:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_4">
+ <item row="1" column="8">
+ <widget class="QPushButton" name="pushButtonReset">
 <property name="text">
- <string>Top:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QSpinBox" name="spinBoxRight">
- <property name="maximum">
- <number>2147483647</number>
+ <string>Reset</string>
 </property>
 </widget>
 </item>
 <item row="0" column="2">
- <spacer>
+ <spacer name="horizontalSpacer_1">
 <property name="orientation">
 <enum>Qt::Horizontal</enum>
 </property>
@@ -83,30 +69,54 @@
 </property>
 </spacer>
 </item>
- <item row="1" column="5">
- <spacer>
+ <item row="0" column="4">
+ <widget class="QSpinBox" name="spinBoxRight">
+ <property name="maximum">
+ <number>2147483647</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Top:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5">
+ <spacer name="horizontalSpacer_2">
 <property name="orientation">
 <enum>Qt::Horizontal</enum>
 </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
 <property name="sizeHint" stdset="0">
 <size>
- <width>40</width>
+ <width>26</width>
 <height>20</height>
 </size>
 </property>
 </spacer>
 </item>
- <item row="1" column="6">
- <widget class="QPushButton" name="pushButtonReset">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
 <property name="text">
- <string>Reset</string>
+ <string>Left:</string>
 </property>
 </widget>
 </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBoxTop">
- <property name="maximum">
- <number>2147483647</number>
+ <item row="1" column="3">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Bottom:</string>
 </property>
 </widget>
 </item>
@@ -117,66 +127,76 @@
 </property>
 </widget>
 </item>
- <item row="1" column="3">
- <widget class="QLabel" name="label_3">
+ <item row="0" column="8">
+ <widget class="QPushButton" name="pushButtonAutoCrop">
 <property name="text">
- <string>Bottom:</string>
+ <string>Auto Crop</string>
 </property>
 </widget>
 </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Left:</string>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBoxLeft">
+ <property name="maximum">
+ <number>2147483647</number>
 </property>
 </widget>
 </item>
- <item row="0" column="5">
- <spacer>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBoxTop">
+ <property name="maximum">
+ <number>2147483647</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_3">
 <property name="orientation">
 <enum>Qt::Horizontal</enum>
 </property>
 <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <enum>QSizePolicy::Fixed</enum>
 </property>
 <property name="sizeHint" stdset="0">
 <size>
- <width>40</width>
+ <width>26</width>
 <height>20</height>
 </size>
 </property>
 </spacer>
 </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBoxLeft">
- <property name="maximum">
- <number>2147483647</number>
- </property>
- </widget>
- </item>
 <item row="0" column="6">
- <widget class="QPushButton" name="pushButtonAutoCrop">
+ <widget class="QLabel" name="label_5">
 <property name="text">
- <string>Auto Crop</string>
+ <string>Size: </string>
 </property>
 </widget>
 </item>
- <item row="1" column="2">
- <spacer>
+ <item row="0" column="7">
+ <spacer name="horizontalSpacer_4">
 <property name="orientation">
 <enum>Qt::Horizontal</enum>
 </property>
 <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::MinimumExpanding</enum>
 </property>
 <property name="sizeHint" stdset="0">
 <size>
- <width>26</width>
+ <width>40</width>
 <height>20</height>
 </size>
 </property>
 </spacer>
 </item>
+ <item row="1" column="6">
+ <widget class="QCheckBox" name="checkBoxRubber">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>&amp;Hide Rubber Band</string>
+ </property>
+ </widget>
+ </item>
 </layout>
 </item>
 <item>
@@ -216,6 +236,7 @@
 <tabstop>spinBoxRight</tabstop>
 <tabstop>spinBoxTop</tabstop>
 <tabstop>spinBoxBottom</tabstop>
+ <tabstop>checkBoxRubber</tabstop>
 <tabstop>pushButtonAutoCrop</tabstop>
 <tabstop>pushButtonReset</tabstop>
 <tabstop>horizontalSlider</tabstop>

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp Changed

@@ -36,7 +36,7 @@
 /**
     \class ADMVideoEq2
 */
-class  ADMVideoEq2:public ADM_coreVideoFilterCached
+class  ADMVideoEq2:public ADM_coreVideoFilter
 {
 
   protected:
@@ -56,7 +56,7 @@
 }     ;
 
 // Add the hook to make it valid plugin
-DECLARE_VIDEO_FILTER(   ADMVideoEq2,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE( ADMVideoEq2, // Class
                         1,0,0,              // Version
                         ADM_UI_TYPE_BUILD,         // UI
                         VF_COLORS,            // Category
@@ -78,19 +78,20 @@
 /**
     \fn getConfiguration
 */
-const char   *ADMVideoEq2::getConfiguration(void)   
+const char   *ADMVideoEq2::getConfiguration(void)
 {
     static char s[256];
-    snprintf(s,255," Eq2 :Cont:%1.2f Brigh:%1.2f Sat:%1.2f",
-                _param.contrast,_param.brightness,_param.saturation);
+    snprintf(s,255,"Eq2: Contrast: %1.2f; Brightness: %1.2f; Saturation: %1.2f; Gamma: %1.2f; Gamma Weight: %1.2f; Red: %1.2f; Green: %1.2f; Blue: %1.2f",
+            _param.contrast,_param.brightness,_param.saturation,
+            _param.gamma,_param.gamma_weight,
+            _param.rgamma,_param.ggamma,_param.bgamma);
     return s;
-        
 }
 /**
     \fn ctor
 */
 ADMVideoEq2::ADMVideoEq2(ADM_coreVideoFilter *in,CONFcouple *couples) 
-        : ADM_coreVideoFilterCached(1,in,couples)
+        : ADM_coreVideoFilter(in,couples)
 {
   if(!couples || !ADM_paramLoad(couples,eq2_param,&_param))
   {
@@ -139,31 +140,23 @@
 */
  bool         ADMVideoEq2::getNextFrame(uint32_t *fn,ADMImage *image)
 {
-
-  ADMImage *mysrc=NULL;
-  
-  mysrc=vidCache->getImage(nextFrame);
-  if(!mysrc) return 0;
-  *fn=nextFrame++;
-  image->copyInfo(mysrc);
+  if(!previousFilter->getNextFrame(fn,image)) return false;
 
 #ifdef CAN_DO_INLINE_X86_ASM
   if(CpuCaps::hasMMX())
   {
-        affine_1d_MMX(&(settings.param[0]),mysrc,image,PLANAR_Y);
-        affine_1d_MMX(&(settings.param[2]),mysrc,image,PLANAR_U);
-        affine_1d_MMX(&(settings.param[1]),mysrc,image,PLANAR_V);
+        affine_1d_MMX(&(settings.param[0]),image,image,PLANAR_Y);
+        affine_1d_MMX(&(settings.param[2]),image,image,PLANAR_U);
+        affine_1d_MMX(&(settings.param[1]),image,image,PLANAR_V);
    }
    else
 #endif
    {
-        apply_lut(&(settings.param[0]),mysrc,image,PLANAR_Y);
-        apply_lut(&(settings.param[2]),mysrc,image,PLANAR_U);
-        apply_lut(&(settings.param[1]),mysrc,image,PLANAR_V);
+        apply_lut(&(settings.param[0]),image,image,PLANAR_Y);
+        apply_lut(&(settings.param[2]),image,image,PLANAR_U);
+        apply_lut(&(settings.param[1]),image,image,PLANAR_V);
     }
-  vidCache->unlockAll();
-  
-  
+
   return 1;
 }
 /**

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp Changed

@@ -23,9 +23,12 @@
 */
 class AVDM_Fade : public ADM_coreVideoFilterCached
 {
+ uint32_t max;
+ void boundsCheck(void);
 protected:
 fade param;
 bool buildLut(void);
+
 public:
 AVDM_Fade(ADM_coreVideoFilter *previous,CONFcouple *conf);
 ~AVDM_Fade();
@@ -61,7 +64,6 @@
 */
 bool AVDM_Fade::configure()
 {
- 
 diaMenuEntry menuE[2]={{0,QT_TRANSLATE_NOOP("fadeToBlack","Out"),QT_TRANSLATE_NOOP("fadeToBlack","Fade out")},{1,QT_TRANSLATE_NOOP("fadeToBlack","In"),QT_TRANSLATE_NOOP("fadeToBlack","Fade in")}};
 uint32_t start,end;
 
@@ -69,18 +71,17 @@
 while(1)
 {
 uint32_t eInOut=(uint32_t)param.inOut;
- 
- uint32_t mx=9*3600*1000;
+
 diaElemMenu menu(&(eInOut),QT_TRANSLATE_NOOP("fadeToBlack","_Fade type:"), 2,menuE);
- diaElemTimeStamp start(&(param.startFade),QT_TRANSLATE_NOOP("fadeToBlack","_Start time (ms):"),0,mx);
- diaElemTimeStamp end(&(param.endFade),QT_TRANSLATE_NOOP("fadeToBlack","_End time (ms):"),0,mx);
+ diaElemTimeStamp start(&(param.startFade),QT_TRANSLATE_NOOP("fadeToBlack","_Start time:"),0,max);
+ diaElemTimeStamp end(&(param.endFade),QT_TRANSLATE_NOOP("fadeToBlack","_End time:"),0,max);
 diaElem *elems[3]={&menu,&start,&end};
 
 if( diaFactoryRun(QT_TRANSLATE_NOOP("fadeToBlack","Fade to black"),3+0*1,elems))
 {
- 
 param.inOut=eInOut;
 buildLut();
+ boundsCheck();
 return 1;
 }else
 return 0;
@@ -107,11 +108,12 @@
 */
 AVDM_Fade::AVDM_Fade(ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilterCached(3,in,setup)
 {
+ max=(uint32_t)(in->getInfo()->totalDuration/1000);
 if(!setup || !ADM_paramLoad(setup,fade_param,&param))
 {
 // Default value
- param.startFade=0; 
- param.endFade=0;
+ param.startFade=0;
+ param.endFade=max;
 param.inOut=0;
 param.toBlack=true;
 
@@ -126,6 +128,7 @@
 */
 void AVDM_Fade::setCoupledConf(CONFcouple *couples)
 {
+ boundsCheck();
 ADM_paramLoad(couples, fade_param, &param);
 }
 
@@ -136,6 +139,7 @@
 */
 bool AVDM_Fade::getCoupledConf(CONFcouple **couples)
 {
+ boundsCheck();
 return ADM_paramSave(couples, fade_param,&param);
 }
 
@@ -262,6 +266,23 @@
 }
 return true;
 }
+/**
+ * \fn boundsCheck
+ * \brief Reset invalid start and end values
+ */
+void AVDM_Fade::boundsCheck(void)
+{
+ if(param.endFade < param.startFade)
+ {
+ uint32_t tmp=param.startFade;
+ param.startFade=param.endFade;
+ param.endFade=tmp;
+ }
+ if(param.endFade > max)
+ param.endFade=max;
+ if(param.startFade > max)
+ param.startFade=0;
+}
 //EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/hue.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/hue.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp Changed

@@ -43,7 +43,10 @@
 configuration.y=0;
 configuration.alpha=255;
 configuration.logoImageFile=std::string("");
+ configuration.fade=0;
 }
+ in->getTimeRange(&startOffset,&endOffset);
+ from=in->getAbsoluteStartTime();
 myName="logo";
 reloadImage();
 }
@@ -87,10 +90,39 @@
 }
 if(myImage)
 {
+ double a=(double)configuration.alpha;
+ uint64_t pts=image->Pts;
+ pts+=from;
+ uint64_t transition=configuration.fade*1000LL;
+ uint64_t duration=endOffset-startOffset;
+ if(transition && duration)
+ {
+ if(transition*2 > duration)
+ transition=duration/2;
+ if(pts < startOffset || pts >= endOffset)
+ {
+ a = 0.;
+ }else
+ {
+ pts -= startOffset;
+ if(pts < transition)
+ {
+ a /= (double)transition;
+ a *= pts;
+ }
+ if(pts > duration-transition)
+ {
+ a /= (double)transition;
+ a *= duration-pts;
+ }
+ }
+ if(a > 255.)
+ a = 255.;
+ }
 if(myImage->GetReadPtr(PLANAR_ALPHA))
- myImage->copyWithAlphaChannel(image,configuration.x,configuration.y);
+ myImage->copyWithAlphaChannel(image,configuration.x,configuration.y,(uint32_t)a);
 else
- myImage->copyToAlpha(image,configuration.x,configuration.y,configuration.alpha);
+ myImage->copyToAlpha(image,configuration.x,configuration.y,(uint32_t)a);
 }
 return true;
 }
@@ -114,7 +146,12 @@
 */
 const char *addLogopFilter::getConfiguration(void)
 {
- return "Add logo.";
+ static char c[2560];
+ snprintf(c,2559,"X: %d; Y: %d; Alpha: %d; Fade-in/out: %d ms;\nimage: %s",
+ configuration.x,configuration.y,configuration.alpha,configuration.fade,
+ configuration.logoImageFile.c_str());
+ return c;
+
 }
 
 /**
@@ -122,7 +159,9 @@
 */
 bool addLogopFilter::configure( void)
 {
- return DIA_getLogo(&configuration, this->previousFilter);
+ bool r=DIA_getLogo(&configuration, this->previousFilter);
+ reloadImage();
+ return r;
 }

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp Changed

@@ -135,13 +135,9 @@
 imageHeight=image->GetHeight(PLANAR_Y); 
 this->imageName=std::string(imageName);
 ui.labelImage->setText(this->imageName.c_str());
- 
 if(image->GetReadPtr(PLANAR_ALPHA))
- ui.spinAlpha->setEnabled(false);
- else
- ui.spinAlpha->setEnabled(true);
- status=true; 
- 
+ ADM_info("We have alpha\n");
+ status=true;
 }
 }
 enableLowPart(status);
@@ -160,7 +156,6 @@
 _in=in;
 
 image=NULL;;
- alpha=param->alpha;
 admCoreUtils::getLastReadFolder(lastFolder);
 if(param->logoImageFile.size())
 {
@@ -176,36 +171,43 @@
 height=in->getInfo()->height;
 
 canvas=new ADM_LogoCanvas(ui.graphicsView,width,height);
- 
 myLogo=new flyLogo(this, width, height,in,canvas,ui.horizontalSlider);
- myLogo->param.x=param->x;
- myLogo->param.y=param->y;
- myLogo->param.alpha=param->alpha;
- myLogo->param.logoImageFile=std::string("");
- myLogo->_cookie=this;
- 
- myLogo->setPreview(false);
+
 #define SPINENTRY(x) ui.x
 SPINENTRY(spinX)->setMaximum(width); 
 SPINENTRY(spinY)->setMaximum(height);
 SPINENTRY(spinAlpha)->setMaximum(255);
 SPINENTRY(spinAlpha)->setMinimum(0);
+ SPINENTRY(spinFadeInOut)->setDecimals(1);
+ SPINENTRY(spinFadeInOut)->setSuffix(QT_TRANSLATE_NOOP("logo"," s"));
+ SPINENTRY(spinFadeInOut)->setSingleStep(.1);
+ SPINENTRY(spinFadeInOut)->setMaximum(10.);
+ SPINENTRY(spinFadeInOut)->setMinimum(0.);
 SPINENTRY(spinX)->setSingleStep(1);
 SPINENTRY(spinY)->setSingleStep(1);
- 
+
+ myLogo->param.x=param->x;
+ myLogo->param.y=param->y;
+ myLogo->param.alpha=param->alpha;
+ myLogo->param.logoImageFile=param->logoImageFile;
+ myLogo->param.fade=param->fade;
+ myLogo->_cookie=this;
 myLogo->upload();
- myLogo->sliderChanged();
+ myLogo->setPreview(false);
+
 connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
 connect( ui.pushButtonSelect,SIGNAL(pressed()),this,SLOT(imageSelect()));
-#define SPINNER(x) connect( ui.x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
- SPINNER(spinX);
- SPINNER(spinY);
- SPINNER(spinAlpha);
+#define SPINNER(x,y) connect(ui.x,SIGNAL(valueChanged(y)),this,SLOT(valueChanged(y)));
+ SPINNER(spinX,int);
+ SPINNER(spinY,int);
+ SPINNER(spinAlpha,int);
+ SPINNER(spinFadeInOut,double);
 connect(canvas, SIGNAL(movedSignal(int,int)),this, SLOT(moved(int,int)));
- myLogo->sameImage();
- 
+
 myLogo->addControl(ui.toolboxLayout);
- 
+ myLogo->sliderChanged();
+
+ setModal(true);
 show();
 myLogo->adjustCanvasPosition();
 canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
@@ -227,8 +229,8 @@
 DUPE(x)
 DUPE(y)
 DUPE(alpha)
+ DUPE(fade)
 param->logoImageFile=imageName;
- 
 }
 /**
 \fn dtor
@@ -255,6 +257,18 @@
 }
 
 /**
+ \fn valueChanged
+*/
+void Ui_logoWindow::valueChanged(double f)
+{
+ if(lock) return;
+ lock++;
+ myLogo->download();
+ myLogo->sameImage();
+ lock--;
+}
+
+/**
 * 
 * @param x
 * @param y
@@ -302,6 +316,15 @@
 }
 
 /**
+ \fn flyLogo ctor
+*/
+flyLogo::flyLogo (QDialog *parent, uint32_t width, uint32_t height, ADM_coreVideoFilter *in, ADM_QCanvas *canvas, ADM_QSlider *slider)
+ : ADM_flyDialogYuv(parent,width,height,in,canvas,slider,RESIZE_AUTO)
+{
+ in->getTimeRange(&startOffset,&endOffset);
+}
+
+/**
 * 
 * @param x
 * @param y
@@ -330,7 +353,8 @@
 #define MYSPIN(x) parent->ui.x
 MYSPIN(spinX)->setValue(param.x);
 MYSPIN(spinY)->setValue(param.y);
- MYSPIN(spinAlpha)->setValue(param.alpha); 
+ MYSPIN(spinAlpha)->setValue(param.alpha);
+ MYSPIN(spinFadeInOut)->setValue((double)(param.fade)/1000);
 parent->ui.labelImage->setText(parent->imageName.c_str());
 return 1;
 }
@@ -343,6 +367,8 @@
 param.x= MYSPIN(spinX)->value();
 param.y= MYSPIN(spinY)->value();
 param.alpha= MYSPIN(spinAlpha)->value();
+#define ROUNDUP 100
+ param.fade=(((uint32_t)(MYSPIN(spinFadeInOut)->value() * 1000.) + ROUNDUP/2)/ROUNDUP)*ROUNDUP;
 return true;
 }
 
@@ -352,6 +378,7 @@
 uint8_t flyLogo::processYuv(ADMImage* in, ADMImage *out)
 {
 out->duplicate(in);
+ uint64_t pts=in->Pts;
 Ui_logoWindow *parent=(Ui_logoWindow *)this->_cookie;
 if(!parent->image)
 return true;
@@ -366,13 +393,39 @@
 return true;
 
 ADMImage *myImage=parent->image;
- if(myImage->GetReadPtr(PLANAR_ALPHA))
+ double a=(double)param.alpha;
+ uint64_t transition=param.fade*1000LL;
+ uint64_t duration=endOffset-startOffset;
+
+ if(transition && duration)
 {
- ADM_info("We have alpha\n");
- myImage->copyWithAlphaChannel(out,param.x,param.y);
+ if(transition*2 > duration)
+ transition=duration/2;
+ if(pts < startOffset || pts >= endOffset)
+ {
+ a = 0.;
+ }else
+ {
+ pts -= startOffset;
+ if(pts < transition)
+ {
+ a /= (double)transition;
+ a *= pts;
+ }
+ if(pts > duration-transition)
+ {
+ a /= (double)transition;
+ a *= duration-pts;
+ }
+ }
+ if(a > 255.)
+ a = 255.;
 }
+
+ if(myImage->GetReadPtr(PLANAR_ALPHA))
+ myImage->copyWithAlphaChannel(out,param.x,param.y,(uint32_t)a);
 else
- myImage->copyToAlpha(out,param.x,param.y,param.alpha);
+ myImage->copyToAlpha(out,param.x,param.y,(uint32_t)a);
 return true;
 }

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui Changed

@@ -97,9 +97,6 @@
 </item>
 <item>
 <widget class="QLabel" name="label_4">
- <property name="toolTip">
- <string>Alpha will be ignored if the image has alpha channel (png in RGB)</string>
- </property>
 <property name="text">
 <string>Alpha</string>
 </property>
@@ -118,6 +115,26 @@
 </property>
 </widget>
 </item>
+ <item>
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Fade-in/out</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="spinFadeInOut">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
 </layout>
 </item>
 <item>
@@ -166,7 +183,7 @@
 <item row="5" column="0">
 <widget class="QLabel" name="label_5">
 <property name="text">
- <string>You can click in the image to set the logo approximatively</string>
+ <string>You can click in the image to approximately position the logo</string>
 </property>
 </widget>
 </item>

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp Changed

@@ -19,10 +19,22 @@
 #include "DIA_coreToolkit.h"
 #include "ADM_toolkitQt.h"
 
-static double aspectRatio[2][3]={
- {1.,0.888888,1.19}, // NTSC 1:1 4:3 16:9
- {1.,1.066667,1.43} // PAL 1:1 4:3 16:9
- };
+static double aspectRatio[2][5]={
+ {
+ 1.,
+ 0.888889, // NTSC 720x480 DAR 4:3 PAR 8:9
+ 0.909091, // NTSC 704x480 DAR 4:3 PAR 10:11
+ 1.185185, // NTSC 720:480 DAR 16:9 PAR 32:27
+ 1.212121 // NTSC 704:480 DAR 16:9 PAR 40:33
+ },
+ {
+ 1.,
+ 1.066667, // PAL 720:576 DAR 4:3 PAR 16:15
+ 1.090909, // PAL 704:576 DAR 4:3 PAR 12:11
+ 1.422222, // PAL 720:576 DAR 16:9 PAR 64:45
+ 1.454545 // PAL 704:576 DAR 16:9 PAR 16:11
+ }
+};
 #define aprintf
 
 resizeWindow::resizeWindow(QWidget *parent, resParam *param) : QDialog(parent)
@@ -30,13 +42,34 @@
 ui.setupUi(this);
 	 lastPercentage = 100;
 _param=param;
+
+#define ADD_PAR(x) ui.comboBoxSource->addItem(x); ui.comboBoxDestination->addItem(x);
+
+ if(_param->pal)
+ {
+ ADD_PAR("PAL 720:576 DAR 4:3 PAR 16:15")
+ ADD_PAR("PAL 704:576 DAR 4:3 PAR 12:11")
+ ADD_PAR("PAL 720:576 DAR 16:9 PAR 64:45")
+ ADD_PAR("PAL 704:576 DAR 16:9 PAR 16:11")
+ }else
+ {
+ ADD_PAR("NTSC 720x480 DAR 4:3 PAR 8:9")
+ ADD_PAR("NTSC 704x480 DAR 4:3 PAR 10:11")
+ ADD_PAR("NTSC 720:480 DAR 16:9 PAR 32:27")
+ ADD_PAR("NTSC 704:480 DAR 16:9 PAR 40:33")
+ }
+
+ ui.lockArCheckBox->setChecked(_param->rsz.lockAR);
+ ui.checkBoxRoundup->setChecked(_param->rsz.roundup);
 ui.spinBoxWidth->setValue(_param->rsz.width);
 ui.spinBoxHeight->setValue(_param->rsz.height);
 ui.horizontalSlider->setValue(100);
 	 ui.comboBoxAlgo->setCurrentIndex(_param->rsz.algo);
 ui.comboBoxSource->setCurrentIndex(_param->rsz.sourceAR);
 ui.comboBoxDestination->setCurrentIndex(_param->rsz.targetAR);
- updateWidthHeightSpinners();
+ if(_param->rsz.lockAR)
+ updateWidthHeightSpinners();
+ enableControls(_param->rsz.lockAR);
 
 	 connect(ui.comboBoxSource, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
 	 connect(ui.comboBoxDestination, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
@@ -54,6 +87,8 @@
 _param->rsz.algo=ui.comboBoxAlgo->currentIndex();
 _param->rsz.sourceAR=ui.comboBoxSource->currentIndex();
 _param->rsz.targetAR=ui.comboBoxDestination->currentIndex();
+ _param->rsz.lockAR=ui.lockArCheckBox->isChecked();
+ _param->rsz.roundup=ui.checkBoxRoundup->isChecked();
 }
 
 void resizeWindow::sliderChanged(int value)
@@ -150,12 +185,12 @@
 	float ar = 1.;
 
 	if (sar)
-	{ // source is 4/3 or 16/9
+	{ // source pixel aspect ratio is not 1:1
 		sr_mul = aspectRatio[_param->pal][sar];
 	}
 
 	if (dar)
-	{ // dst is 4/3 or 16/9
+	{ // dst pixel aspect ratio is not 1:1
 		dst_mul = 1 / aspectRatio[_param->pal][dar];
 	}
 
@@ -224,6 +259,8 @@
 		widthSpinBoxChanged(0);
 	else
 		ui.checkBoxRoundup->setChecked(false);
+
+ enableControls(toggled);
 }
 
 void resizeWindow::roundupToggled(bool toggled)
@@ -245,6 +282,24 @@
 	}
 }
 
+void resizeWindow::enableControls(bool lockArChecked)
+{
+#define ENABLE(x) ui.x->setEnabled(lockArChecked);
+
+ ENABLE(label_3)
+ ENABLE(label_4)
+ ENABLE(label_5)
+ ENABLE(label_8)
+ ENABLE(label_9)
+ ENABLE(label_10)
+ ENABLE(horizontalSlider)
+ ENABLE(percentageSpinBox)
+ ENABLE(checkBoxRoundup)
+ ENABLE(labelErrorXY)
+ ENABLE(comboBoxSource)
+ ENABLE(comboBoxDestination)
+}
+
 void resizeWindow::okButtonClicked()
 {
 	if (ui.spinBoxWidth->value() & 1 || ui.spinBoxHeight->value() & 1)
@@ -268,7 +323,7 @@
 *resize
 };
 //
- if(fps1000>24600 && fps1000<25400)
+ if((fps1000>24600 && fps1000<25400) || (fps1000>49200 && fps1000<50800))
 {
 param.pal=1;
 }

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui Changed

@@ -36,9 +36,6 @@
 <property name="text" >
 <string>Lock Aspect Ratio</string>
 </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
 </widget>
 </item>
 <item>
@@ -52,7 +49,7 @@
 <item>
 <widget class="QLabel" name="label_4" >
 <property name="text" >
- <string>Source:</string>
+ <string>Source PAR:</string>
 </property>
 </widget>
 </item>
@@ -60,17 +57,7 @@
 <widget class="QComboBox" name="comboBoxSource" >
 <item>
 <property name="text" >
- <string>1:1</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>4:3</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>16:9</string>
+ <string>1:1 (square pixels)</string>
 </property>
 </item>
 </widget>
@@ -94,7 +81,7 @@
 <item>
 <widget class="QLabel" name="label_3" >
 <property name="text" >
- <string>Destination:</string>
+ <string>Destination PAR:</string>
 </property>
 </widget>
 </item>
@@ -102,17 +89,7 @@
 <widget class="QComboBox" name="comboBoxDestination" >
 <item>
 <property name="text" >
- <string>1:1</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>4:3</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>16:9</string>
+ <string>1:1 (square pixels)</string>
 </property>
 </item>
 </widget>
@@ -165,7 +142,7 @@
 <item>
 <widget class="QSpinBox" name="spinBoxWidth" >
 <property name="maximum" >
- <number>2900</number>
+ <number>4096</number>
 </property>
 <property name="minimum" >
 <number>16</number>
@@ -201,7 +178,7 @@
 <item>
 <widget class="QSpinBox" name="spinBoxHeight" >
 <property name="maximum" >
- <number>2000</number>
+ <number>2160</number>
 </property>
 <property name="minimum" >
 <number>16</number>
@@ -528,197 +505,5 @@
 </hint>
 </hints>
 </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_8</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>184</x>
- <y>117</y>
- </hint>
- <hint type="destinationlabel" >
- <x>39</x>
- <y>148</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_5</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>184</x>
- <y>117</y>
- </hint>
- <hint type="destinationlabel" >
- <x>150</x>
- <y>148</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_9</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>184</x>
- <y>117</y>
- </hint>
- <hint type="destinationlabel" >
- <x>267</x>
- <y>148</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>horizontalSlider</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>184</x>
- <y>117</y>
- </hint>
- <hint type="destinationlabel" >
- <x>156</x>
- <y>164</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>percentageSpinBox</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>184</x>
- <y>117</y>
- </hint>
- <hint type="destinationlabel" >
- <x>317</x>
- <y>155</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>checkBoxRoundup</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>184</x>
- <y>95</y>
- </hint>
- <hint type="destinationlabel" >
- <x>184</x>
- <y>117</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_10</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>182</x>
- <y>155</y>
- </hint>
- <hint type="destinationlabel" >
- <x>55</x>
- <y>251</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>labelErrorXY</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>182</x>
- <y>155</y>
- </hint>
- <hint type="destinationlabel" >
- <x>114</x>
- <y>251</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_4</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>182</x>
- <y>69</y>
- </hint>
- <hint type="destinationlabel" >
- <x>46</x>
- <y>95</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>comboBoxSource</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>182</x>
- <y>69</y>
- </hint>
- <hint type="destinationlabel" >
- <x>94</x>
- <y>95</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_3</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>182</x>
- <y>69</y>
- </hint>
- <hint type="destinationlabel" >
- <x>188</x>
- <y>95</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>lockArCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>comboBoxDestination</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>182</x>
- <y>69</y>
- </hint>
- <hint type="destinationlabel" >
- <x>247</x>
- <y>95</y>
- </hint>
- </hints>
- </connection>
 </connections>
 </ui>

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swresize.conf -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swresize.conf Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swresize.h -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swresize.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swresize_desc.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swresize_desc.cpp Changed

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swresize_json.cpp Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/CMakeLists.txt Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage.conf Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage.h Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage_desc.cpp Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage_json.cpp Added

avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp Added

@@ -0,0 +1,254 @@
+/***************************************************************************
+ \file stillimage.cpp
+ \author eumagga0x2a @mailbox.org
+ \brief Duplicate frame for a given duration
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_vidMisc.h"
+#include "ADM_coreVideoFilter.h"
+#include "DIA_coreToolkit.h"
+#include "DIA_factory.h"
+
+#include "confStillimage.h"
+#include "confStillimage_desc.cpp"
+
+#if 1
+ #define aprintf(...) {}
+#else
+ #define aprintf printf
+#endif
+
+/**
+ \class stillimage
+*/
+class stillimage : public ADM_coreVideoFilter
+{
+protected:
+ configuration params;
+ uint64_t from, begin, end;
+ uint64_t timeIncrement;
+ uint32_t frameNb, nbStillImages;
+ ADMImage *stillPicture;
+
+ bool updateTimingInfo(void);
+ void cleanup(void);
+
+public:
+ stillimage(ADM_coreVideoFilter *in, CONFcouple *conf);
+ ~stillimage();
+ virtual const char *getConfiguration(void); // Return current configuration as a human-readable string
+ virtual bool getNextFrame(uint32_t *fn, ADMImage *image); // Get the next image
+ virtual bool getCoupledConf(CONFcouple **couples); // Get the current filter configuration
+ virtual void setCoupledConf(CONFcouple *couples);
+ virtual bool goToTime(uint64_t usSeek);
+ virtual bool getTimeRange(uint64_t *startTme, uint64_t *endTme); // Provide an updated time range for the next filter
+ virtual bool configure(void); // Start graphical user interface
+};
+
+DECLARE_VIDEO_FILTER( stillimage, // Class
+ 1,0,0, // Version
+ ADM_UI_ALL, // UI
+ VF_TRANSFORM, // Category
+ "stillimage", // Internal name (must be unique!)
+ QT_TRANSLATE_NOOP("stillimage", "Still Image"), // Display name
+ QT_TRANSLATE_NOOP("stillimage", "Duplicate frames for a given duration.") // Description
+ );
+
+/**
+ \fn getConfiguration
+*/
+const char *stillimage::getConfiguration(void)
+{
+ static char buf[256];
+ snprintf(buf, 255, "Duplicate frame at %s for %.3f s",
+ ADM_us2plain(1000LL*params.start),
+ (double)params.duration/1000.);
+ return buf;
+}
+/**
+ \fn ctor
+*/
+stillimage::stillimage( ADM_coreVideoFilter *in, CONFcouple *setup ) : ADM_coreVideoFilter(in, setup)
+{
+ if(!setup || !ADM_paramLoad(setup, configuration_param, &params))
+ {
+ // Default values
+ params.start=0; // the first frame
+ params.duration=10000; // 10 seconds
+ }
+
+ from=in->getAbsoluteStartTime();
+ timeIncrement=in->getInfo()->frameIncrement;
+ updateTimingInfo();
+ stillPicture=NULL;
+ frameNb=0;
+ nbStillImages=0;
+}
+
+/**
+ \fn dtor
+*/
+stillimage::~stillimage()
+{
+ cleanup();
+}
+
+/**
+ \fn cleanup
+*/
+void stillimage::cleanup(void)
+{
+ if(stillPicture)
+ delete stillPicture;
+ stillPicture=NULL;
+}
+
+/**
+ \fn getCoupledConf
+*/
+bool stillimage::getCoupledConf(CONFcouple **couples)
+{
+ return ADM_paramSave(couples, configuration_param, &params);
+}
+
+/**
+ \fn setCoupledConf
+*/
+void stillimage::setCoupledConf(CONFcouple *couples)
+{
+ ADM_paramLoad(couples, configuration_param, &params);
+}
+
+/**
+ \fn goToTime
+*/
+bool stillimage::goToTime(uint64_t usSeek)
+{
+ cleanup();
+ uint64_t time=usSeek;
+ if(time >= begin && time <= end)
+ time=begin;
+ else if(time > end)
+ time-=end-begin;
+ return previousFilter->goToTime(time);
+}
+
+/**
+ \fn getTimeRange
+*/
+bool stillimage::getTimeRange(uint64_t *startTme, uint64_t *endTme)
+{
+ *startTme=0;
+ *endTme=info.totalDuration;
+ return true;
+}
+
+/**
+ \fn getNextFrame
+*/
+bool stillimage::getNextFrame(uint32_t *fn, ADMImage *image)
+{
+ // we have the image and are within range
+ if(stillPicture && stillPicture->Pts < end)
+ {
+ uint64_t pts=stillPicture->Pts;
+ pts+=timeIncrement;
+ stillPicture->Pts=pts;
+ // output our image instead of requesting a new frame from the previous filter
+ image->duplicate(stillPicture);
+ frameNb++;
+ *fn=frameNb;
+ nbStillImages++;
+ aprintf("[stillimage] stillPicture PTS = %s, frame %d\n",ADM_us2plain(pts),*fn);
+ return true;
+ }
+ // not in range, get a frame from the previous filter
+ if(!previousFilter->getNextFrame(fn,image))
+ return false;
+ uint64_t pts=image->Pts;
+ if(pts==ADM_NO_PTS || pts < begin)
+ {
+ *fn+=nbStillImages;
+ return true;
+ }
+ aprintf("[stillimage] original image PTS = %" PRIu64" ms\n",pts/1000);
+ // now in range, create our image
+ if(!stillPicture)
+ {
+ aprintf("[stillimage] creating stillPicture\n");
+ stillPicture=new ADMImageDefault(previousFilter->getInfo()->width, previousFilter->getInfo()->height);
+ stillPicture->duplicate(image);
+ frameNb=*fn;
+ return true;
+ }
+ // past the end, adjust the PTS and the frame count
+ pts+=end-begin;
+ image->Pts=pts;
+ *fn+=nbStillImages;
+ aprintf("[stillimage] final image PTS = %" PRIu64" ms, frame %d\n",pts/1000,*fn);
+
+ return true;
+}
+
+/**
+ \fn updateTimingInfo
+ \brief perform a sanity check and update info with the new totalDuration
+*/
+bool stillimage::updateTimingInfo(void)
+{
+ uint64_t old=previousFilter->getInfo()->totalDuration;
+ if(1000LL*params.start + timeIncrement > old)
+ {
+ if(old > timeIncrement)
+ params.start=(uint32_t)((old-timeIncrement)/1000);
+ else
+ params.start=0;
+ }
+
+ begin=1000LL*params.start;
+ end=begin+1000LL*params.duration;
+ if(from < begin)
+ {
+ begin-=from;
+ end-=from;
+ }else if(from < end)
+ {
+ begin=0;
+ end-=from;
+ }else
+ {
+ begin=end=0;
+ }
+
+ info.totalDuration=old+end-begin;
+ return true;
+}
+
+/**
+ \fn configure
+*/
+bool stillimage::configure(void)
+{
+ uint32_t dur=(uint32_t)(previousFilter->getInfo()->totalDuration/1000LL);
+ uint32_t max9h=9*3600*1000;
+
+ diaElemTimeStamp start(&params.start,QT_TRANSLATE_NOOP("stillimage","_Start time:"),0,dur);
+ diaElemTimeStamp duration(&params.duration,QT_TRANSLATE_NOOP("stillimage","_Duration:"),0,max9h);
+
+ diaElem *elems[2]={&start,&duration};
+ bool r=diaFactoryRun(QT_TRANSLATE_NOOP("stillimage","Still Image"),2,elems);
+ updateTimingInfo();
+ return r;
+}
+
+//EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp -> avidemux_2.7.1.tar.gz/avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/pluginsPackageDebian.cmake -> avidemux_2.7.1.tar.gz/avidemux_plugins/pluginsPackageDebian.cmake Changed

avidemux_2.7.1.tar.gz/bootStrapOsx_HighSierra.bash Added

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

avidemux_2.7.0.tar.gz/bootStrapOsx_Sierra.bash -> avidemux_2.7.1.tar.gz/bootStrapOsx_Sierra.bash Changed

@@ -38,6 +38,10 @@
 do_rebuild=0
 debug=0
 create_app_bundle=1
+external_libass=0
+external_liba52=0
+external_libmad=0
+external_libmp4v2=0
 #
 test -f $HOME/myCC  && export COMPILER="-DCMAKE_C_COMPILER=$HOME/myCC -DCMAKE_CXX_COMPILER=$HOME/myC++"
 
@@ -128,21 +132,25 @@
 {
         echo "Bootstrap avidemux ${API_VERSION}:"
         echo "***********************"
-        echo "  --help            : Print usage"
-        echo "  --tgz             : Build tgz packages"
-        echo "  --nopkg           : Don't create macOS app bundle"
-        echo "  --debug           : Switch debugging on"
-        echo "  --rebuild         : Preserve existing build directories"
-        echo "  --output=NAME     : Specify a custom basename for dmg"
-        echo "  --version=STRING  : Specify a custom Avidemux version string"
-        echo "  --with-core       : Build core (default)"
-        echo "  --without-core    : Don't build core"
-        echo "  --with-cli        : Build cli (default)"
-        echo "  --without-cli     : Don't build cli"
-        echo "  --with-qt         : Build qt (default)"
-        echo "  --without-qt      : Don't build qt"
-        echo "  --with-plugins    : Build plugins (default)"
-        echo "  --without-plugins : Don't build plugins"
+        echo "  --help                : Print usage"
+        echo "  --tgz                 : Build tgz packages"
+        echo "  --nopkg               : Don't create macOS app bundle"
+        echo "  --debug               : Switch debugging on"
+        echo "  --rebuild             : Preserve existing build directories"
+        echo "  --output=NAME         : Specify a custom basename for dmg"
+        echo "  --version=STRING      : Specify a custom Avidemux version string"
+        echo "  --with-core           : Build core (default)"
+        echo "  --without-core        : Don't build core"
+        echo "  --with-cli            : Build cli (default)"
+        echo "  --without-cli         : Don't build cli"
+        echo "  --with-qt             : Build qt (default)"
+        echo "  --without-qt          : Don't build qt"
+        echo "  --with-plugins        : Build plugins (default)"
+        echo "  --without-plugins     : Don't build plugins"
+        echo "  --with-system-libass  : Use system libass instead of the bundled one"
+        echo "  --with-system-liba52  : Use system liba52 (a52dec) instead of the bundled one"
+        echo "  --with-system-libmad  : Use system libmad instead of the bundled one"
+        echo "  --with-system-libmp4v2: Use system libmp4v2 instead of the bundled one"
         config
 }
 option_value()
@@ -219,6 +227,18 @@
          --with-core)
                 do_core=1
              ;;
+         --with-system-libass)
+                external_libass=1
+             ;;
+         --with-system-liba52)
+                external_liba52=1
+             ;;
+         --with-system-libmad)
+                external_libmad=1
+             ;;
+         --with-system-libmp4v2)
+                external_libmp4v2=1
+             ;;
         *)
                 echo "unknown parameter $config_option"
                 usage
@@ -237,6 +257,18 @@
 if [ "x$debug" = "x1" ] ; then echo
 POSTFIX="_debug"
 fi
+if [ "x$external_libass" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBASS=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_liba52" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBA52=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_libmad" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBMAD=true $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$external_libmp4v2" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_MP4V2=true $EXTRA_CMAKE_DEFS"
+fi
 if [ "x$create_app_bundle" = "x1" ] ; then
     export DO_BUNDLE="-DCREATE_BUNDLE=true"
 else
@@ -260,17 +292,22 @@
 if [ "x$do_plugins" = "x1" ] ; then
         echo "** Plugins **"
         cd $TOP
-        Process buildPluginsCommon ../avidemux_plugins -DPLUGIN_UI=COMMON
+        Process buildPluginsCommon ../avidemux_plugins "-DPLUGIN_UI=COMMON $EXTRA_CMAKE_DEFS"
 fi
 if [ "x$do_plugins" = "x1" -a "x$do_qt4" = "x1" ] ; then
         echo "** Plugins Qt **"
         cd $TOP
-        Process buildPlugins${qt_ext} ../avidemux_plugins -DPLUGIN_UI=QT4
+        Process buildPlugins${qt_ext} ../avidemux_plugins "-DPLUGIN_UI=QT4 EXTRA_CMAKE_DEFS"
 fi
 if [ "x$do_plugins" = "x1" -a "x$do_cli" = "x1" ] ; then
         echo "** Plugins CLI **"
         cd $TOP
-        Process buildPluginsCLI ../avidemux_plugins -DPLUGIN_UI=CLI
+        Process buildPluginsCLI ../avidemux_plugins "-DPLUGIN_UI=CLI $EXTRA_CMAKE_DEFS"
+fi
+if [ "x$do_plugins" = "x1" ] ; then
+        echo "** Plugins Settings **"
+        cd $TOP
+        Process buildPluginsSettings ../avidemux_plugins "-DPLUGIN_UI=SETTINGS $EXTRA_CMAKE_DEFS"
 fi
 # 
 cd $TOP

avidemux_2.7.0.tar.gz/cmake/ADM_coreConfig.h.cmake -> avidemux_2.7.1.tar.gz/cmake/ADM_coreConfig.h.cmake Changed

avidemux_2.7.0.tar.gz/cmake/ad_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/ad_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/admCheckAudioEncoderLibs.cmake -> avidemux_2.7.1.tar.gz/cmake/admCheckAudioEncoderLibs.cmake Changed

avidemux_2.7.1.tar.gz/cmake/admCheckFribidi.cmake Added

@@ -0,0 +1,34 @@
+include(admCheckFontConfig)
+MACRO(checkFribidi minVersion)
+########################################
+# FRIBIDI
+########################################
+OPTION(FRIBIDI "" ON)
+checkFontConfig()
+MESSAGE(STATUS "Checking for Fribidi (want ${minVersion})")
+MESSAGE(STATUS "**************************************")
+
+IF(HAVE_FONTCONFIG)
+    IF (FRIBIDI)
+        PKG_CHECK_MODULES(FRIBIDI fribidi)
+        PRINT_LIBRARY_INFO("Fribidi" FRIBIDI_FOUND "${FRIBIDI_CFLAGS}" "${FRIBIDI_LDFLAGS}")
+        IF (FRIBIDI_FOUND)
+            MESSAGE(STATUS "Fribidi version ${FRIBIDI_VERSION}")
+                IF(("${FRIBIDI_VERSION}" VERSION_GREATER "${minVersion}.*") OR ("${FRIBIDI_VERSION}" VERSION_EQUAL "${minVersion}.*"))
+                    SET(USE_FRIBIDI 1)
+                ELSE(("${FRIBIDI_VERSION}" VERSION_GREATER "${minVersion}.*") OR ("${FRIBIDI_VERSION}" VERSION_EQUAL "${minVersion}.*"))
+                    MESSAGE(STATUS "Your version of fribidi is too old, we need at least ${minVersion}.*")
+                ENDIF(("${FRIBIDI_VERSION}" VERSION_GREATER "${minVersion}.*") OR ("${FRIBIDI_VERSION}" VERSION_EQUAL "${minVersion}.*"))
+        ENDIF (FRIBIDI_FOUND)
+    ELSE (FRIBIDI)
+        MESSAGE("${MSG_DISABLE_OPTION}")
+    ENDIF (FRIBIDI)
+ELSE(HAVE_FONTCONFIG)
+    MESSAGE(STATUS "No fontconfig => no fribidi...")
+ENDIF(HAVE_FONTCONFIG)
+
+APPEND_SUMMARY_LIST("Miscellaneous" "FRIBIDI" "${USE_FRIBIDI}")
+
+MESSAGE("")
+
+ENDMACRO(checkFribidi)

avidemux_2.7.1.tar.gz/cmake/admCheckVideoToolbox.cmake Added

avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild_helpers.cmake -> avidemux_2.7.1.tar.gz/cmake/admFFmpegBuild_helpers.cmake Changed

@@ -24,7 +24,7 @@
 mjpegb mpeg2video mpeg4 msmpeg4v2 msmpeg4v3 msvideo1 nellymoser png qdm2 rawvideo snow
 svq3 theora tscc mp2 mp3 mp2_float mp3_float
 vc1 vp3 vp6 vp6a vp6f vp8 vp9 wmapro wmav2 wmv1 wmv2 wmv3 cscd lagarith flac vorbis)
-set(FFMPEG_ENCODERS ac3 ac3_float dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow aac dca flac)
+set(FFMPEG_ENCODERS ac3 ac3_float dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 png snow aac dca flac)
 set(FFMPEG_MUXERS flv matroska mpeg1vcd mpeg2dvd mpeg2svcd mpegts mov mp4 psp webm)
 set(FFMPEG_PARSERS ac3 h263 h264 hevc mpeg4video)
 set(FFMPEG_PROTOCOLS file)
@@ -75,7 +75,15 @@
 patch_file("${FFMPEG_SOURCE_DIR}" "${patchFile}")
 endforeach(patchFile)
 
- #
+ message("")
+
+ # upstream patches
+ file(GLOB patchFiles "${FFMPEG_PATCH_DIR}/upstream/*.patch")
+ foreach(patchFile ${patchFiles})
+ get_filename_component(short ${patchFile} NAME)
+ MESSAGE(STATUS "-- Upstream, applying patch <${short}> --")
+ patch_file_p1("${FFMPEG_SOURCE_DIR}" "${patchFile}")
+ endforeach(patchFile)
 message("")
 endif (FFMPEG_PERFORM_PATCH)
 ENDMACRO(ADM_FF_PATCH_IF_NEEDED)
@@ -162,6 +170,7 @@
 INSTALL(FILES "${FFMPEG_BINARY_DIR}/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavutil" COMPONENT dev)
 
 INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h" "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
+ "${FFMPEG_SOURCE_DIR}/libavcodec/videotoolbox.h"
 "${FFMPEG_SOURCE_DIR}/libavcodec/version.h"
 "${FFMPEG_SOURCE_DIR}/libavcodec/audioconvert.h"
 DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
@@ -263,8 +272,8 @@
 OUTPUT_VARIABLE FFMPEG_CONFIGURE_OUTPUT RESULT_VARIABLE FFMPEG_CONFIGURE_RESULT)
 
 if (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
- MESSAGE(ERROR "configure returned <${FFMPEG_CONFIGURE_RESULT}>")
- MESSAGE(ERROR "configure output is <${FFMPEG_CONFIGURE_OUTPUT}>")
+ MESSAGE(SEND_ERROR "configure returned <${FFMPEG_CONFIGURE_RESULT}>")
+ MESSAGE(SEND_ERROR "configure output is <${FFMPEG_CONFIGURE_OUTPUT}>")
 MESSAGE(FATAL_ERROR "An error occured ")
 endif (NOT (FFMPEG_CONFIGURE_RESULT EQUAL 0))
 
@@ -301,7 +310,11 @@
 #
 MACRO(ADM_FF_ADD_DUMMY_TARGET)
 if(NOT MSVC)
- SET(PARRALLEL "-j4") 
+ include(ProcessorCount)
+ ProcessorCount(NPROC)
+ if(NOT NPROC EQUAL 0)
+ SET(PARRALLEL -j${NPROC})
+ endif(NOT NPROC EQUAL 0)
 endif(NOT MSVC)
 add_custom_target( libavutil_dummy ALL
 COMMAND ${CMAKE_BUILD_TOOL} ${PARRALLEL} # We assume make or gnumake when host is unix

avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild_native.cmake -> avidemux_2.7.1.tar.gz/cmake/admFFmpegBuild_native.cmake Changed

avidemux_2.7.0.tar.gz/cmake/admFFmpegVersion.cmake -> avidemux_2.7.1.tar.gz/cmake/admFFmpegVersion.cmake Changed

avidemux_2.7.0.tar.gz/cmake/admMainChecks.cmake -> avidemux_2.7.1.tar.gz/cmake/admMainChecks.cmake Changed

avidemux_2.7.1.tar.gz/cmake/admPluginLocation.cmake Added

avidemux_2.7.0.tar.gz/cmake/admWindRes.cmake -> avidemux_2.7.1.tar.gz/cmake/admWindRes.cmake Changed

@@ -5,8 +5,7 @@
         ENDIF(CROSS)
 include(admTimeStamp)
 #
-MACRO(WINDRESIFY src)
-   IF(NOT MSVC)
+MACRO(WINDRESIFY input icon src)
         # add icon and version info
         SET(FILEVERSION_STRING "${AVIDEMUX_VERSION}")
         SET(PRODUCTVERSION_STRING "${AVIDEMUX_VERSION}")
@@ -22,16 +21,22 @@
 	        SET(WIN_RES_TARGET "pe-i386")
         ENDIF (ADM_CPU_X86_64)
 
-        SET(AVIDEMUX_ICON "adm.ico")
-        CONFIGURE_FILE("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/admWin32.rc.in" ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc IMMEDIATE)
+        #SET(AVIDEMUX_ICON "adm.ico")
+        #SET(FULL_PATH "${CMAKE_CURRENT_SOURCE_DIR}//avidemux/common/xpm/${AVIDEMUX_ICON}")
+        # Convert to native absolute path
+        SET(FULL_PATH "${icon}")
+        get_filename_component(abs "${FULL_PATH}" ABSOLUTE)
+        file(TO_NATIVE_PATH ${abs} ICON_PATH)
+        # replace c:\foo by c:\\foo
+        STRING(REPLACE "\\" "\\\\" ICON_PATH ${ICON_PATH})
+        
+        CONFIGURE_FILE(${input} ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc IMMEDIATE)
 
         if (MINGW)
 	        SET(ADM_WIN_RES "adm.obj")
 	        SET( ${src} ${ADM_WIN_RES})
 	        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ADM_WIN_RES} COMMAND ${WINDRES} -F ${WIN_RES_TARGET} -i ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc -o ${CMAKE_CURRENT_BINARY_DIR}/${ADM_WIN_RES} -O coff --define VS_VERSION_INFO=1)
+        else (MINGW) # MSVC
+            SET(${src}  ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc )
         endif (MINGW)
-	ELSE (NOT MSVC)
-		#SET(${src}  ${CMAKE_CURRENT_BINARY_DIR}/admWin.rc)
-	endif (NOT MSVC)
-
-ENDMACRO(WINDRESIFY src)
+ENDMACRO(WINDRESIFY input icon src)

avidemux_2.7.0.tar.gz/cmake/ae_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/ae_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/av_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/av_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.7.1.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.7.0.tar.gz/cmake/commonCmakeApplication.cmake -> avidemux_2.7.1.tar.gz/cmake/commonCmakeApplication.cmake Changed

avidemux_2.7.0.tar.gz/cmake/dm_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/dm_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/mx_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/mx_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/osx/avidemux.icns -> avidemux_2.7.1.tar.gz/cmake/osx/avidemux.icns Changed

avidemux_2.7.0.tar.gz/cmake/se_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/se_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/vd_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/vd_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/ve_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/ve_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/ve_plugin_qt4.cmake -> avidemux_2.7.1.tar.gz/cmake/ve_plugin_qt4.cmake Changed

avidemux_2.7.0.tar.gz/cmake/ve_settings_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/ve_settings_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/vf_plugin.cmake -> avidemux_2.7.1.tar.gz/cmake/vf_plugin.cmake Changed

avidemux_2.7.0.tar.gz/cmake/vf_plugin_cli.cmake -> avidemux_2.7.1.tar.gz/cmake/vf_plugin_cli.cmake Changed

avidemux_2.7.0.tar.gz/cmake/vf_plugin_gtk.cmake -> avidemux_2.7.1.tar.gz/cmake/vf_plugin_gtk.cmake Changed

avidemux_2.7.0.tar.gz/cmake/vf_plugin_qt4.cmake -> avidemux_2.7.1.tar.gz/cmake/vf_plugin_qt4.cmake Changed

avidemux_2.7.0.tar.gz/cmake/vf_plugin_qt4gl.cmake -> avidemux_2.7.1.tar.gz/cmake/vf_plugin_qt4gl.cmake Changed

avidemux_2.7.0.tar.gz/cross-compiling.txt -> avidemux_2.7.1.tar.gz/cross-compiling.txt Changed

@@ -42,7 +42,7 @@
 3. Build required MXE packages for the targets specified above with
 
     cd /opt/mxe
-    make qttools qtwinextras sdl2 ogg vorbis lame a52dec faad2 fdk-aac libmad opus fribidi libass xvidcore x264
+    make qttools qtwinextras sdl2 ogg vorbis lame a52dec faad2 fdk-aac libmad opus fribidi libass xvidcore x264 x265
 
 This pulls in all the dependencies and can take a couple of hours. The final
 total size of the /opt/mxe folder may be about 2.2G. Please note that twolame
@@ -50,53 +50,7 @@
 of this writing.
 
 
-4. Download x265_2.4.tar.gz from
-
-    https://bitbucket.org/multicoreware/x265/downloads
-
-extract the content of the tarball, enter the 'x265_2.4/build' directory,
-create a new subdirectory, e.g. 'mingw-w32', enter this subdirectory, create
-a 'build.cmake' file there with
-
-SET(CMAKE_SYSTEM_NAME Windows)
-SET(CMAKE_C_COMPILER i686-w64-mingw32.shared-gcc)
-SET(CMAKE_CXX_COMPILER i686-w64-mingw32.shared-g++)
-SET(CMAKE_RC_COMPILER i686-w64-mingw32.shared-windres)
-SET(CMAKE_ASM_YASM_COMPILER yasm)
-
-as content, ensure that /opt/mxe/usr/bin is in $PATH and run
-
-    cmake -DCMAKE_TOOLCHAIN_FILE=build.cmake -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr/i686-w64-mingw32.shared -DENABLE_CLI=OFF ../../source
-    make -j $(nproc)
-    make install
-
-(the last command has to be run as root or using sudo if the directory
-'/opt/mxe/usr/i686-w64-mingw32.shared' is not writable by the user).
-
-To build and install 64 bit x265, create e.g. 'mingw-w64' as a subdirectory of
-'x265_2.4/build', enter this subdirectory, create a 'build.cmake' file there
-with
-
-SET(CMAKE_SYSTEM_NAME Windows)
-SET(CMAKE_C_COMPILER x86_64-w64-mingw32.shared-gcc)
-SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32.shared-g++)
-SET(CMAKE_RC_COMPILER x86_64-w64-mingw32.shared-windres)
-SET(CMAKE_ASM_YASM_COMPILER yasm)
-
-as content, again ensure that /opt/mxe/usr/bin is in $PATH  and run
-
-    cmake -DCMAKE_TOOLCHAIN_FILE=build.cmake -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr/x86_64-w64-mingw32.shared -DENABLE_CLI=OFF ../../source
-    make -j $(nproc)
-    make install
-
-(the last command has to be run as root or using sudo if the directory
-'/opt/mxe/usr/x86_64-w64-mingw32.shared' is not writable by the user).
-
-Please note that you need yasm >= 1.3 to build a 64 bit x265 library, this
-requirement is not met on Debian 8.
-
-
-5. To enable hardware-accelerated encoding provided by NVIDIA graphics cards of
+4. To enable hardware-accelerated encoding provided by NVIDIA graphics cards of
 the Kepler generation and later, download the file "nvEncodeAPI.h" e.g. from
 
     https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/compat/nvenc/nvEncodeAPI.h
@@ -105,11 +59,11 @@
 /opt/mxe/usr/x86_64-w64-mingw32.shared/include/ correspondingly.
 
 
-6. Create a user-writable directory 'out' in '/opt/mxe/usr/x86_64-w64-mingw32.shared'
+5. Create a user-writable directory 'out' in '/opt/mxe/usr/x86_64-w64-mingw32.shared'
 and in '/opt/mxe/usr/i686-w64-mingw32.shared' respectively.
 
 
-7. Enter the Avidemux top source directory and run
+6. Enter the Avidemux top source directory and run
 
     bash bootStrapCrossMingwQt5_mxe.sh
 
@@ -127,8 +81,8 @@
 partition, extract it on Windows and run 'avidemux.exe' from there.
 
 
-8. Issues:
+7. Issues:
 
 As of this writing, twolame, aften, vapoursynth and avsproxy are not available.
 
-2017-06-13 UTC 23:00
+2017-11-01 UTC 23:05

avidemux_2.7.0.tar.gz/myOwnPlugins/demuxer/CMakeLists.txt -> avidemux_2.7.1.tar.gz/myOwnPlugins/demuxer/CMakeLists.txt Changed

@@ -1,4 +1,4 @@
-###################################################
+####################################################
 #
 #
 ###################################################
@@ -9,38 +9,41 @@
 
 SET(ADM_PROJECT AdmAsfDemuxer)
 SET(PLUGINS TRUE)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
-########################################
-# Where is the top dir ?
-########################################
+SET(DO_COMMON TRUE)
+SET(AVIDEMUX_VERSION 2.7)                 # important !
+SET(AVIDEMUX_EXTERNAL_BUILD True)         # important !
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
+######################################################
+# Try to locate & setup avidemux development files
+######################################################
+
+MESSAGE(STATUS "Checking for avidemux development files ..")
 
-MESSAGE(STATUS "Checking for AVIDEMUX_SOURCE_DIR, AVIDEMUX_LIB_DIR, AVIDEMUX_INCLUDE_DIR...")
-IF (NOT AVIDEMUX_SOURCE_DIR)
-	MESSAGE(FATAL_ERROR "Please add -DAVIDEMUX_SOURCE_DIR=path_to_avidemux_source. You just need the source tree.")
-ELSE (NOT AVIDEMUX_TOP_SOURCE_DIR)
-        # We need TOP_SOURCE_DIR 
-	SET(AVIDEMUX_TOP_SOURCE_DIR "${AVIDEMUX_SOURCE_DIR}" CACHE STRING "")
-ENDIF (NOT AVIDEMUX_SOURCE_DIR)
-#IF (NOT AVIDEMUX_LIB_DIR)
-	#MESSAGE(FATAL_ERROR "Please add -DAVIDEMUX_LIB_DIR=path_to_avidemux_lib. It is probably /usr/lib or /usr/lib64.")
-#ELSE (NOT AVIDEMUX_LIB_DIR)
-        ## We need AVIDEMUX_LIB_DIR 
-	#SET(AVIDEMUX_LIB_DIR "${AVIDEMUX_LIB_DIR}" CACHE STRING "")
-#ENDIF (NOT AVIDEMUX_LIB_DIR)
-#IF (NOT AVIDEMUX_INCLUDE_DIR)
-	#MESSAGE(FATAL_ERROR "Please add -DAVIDEMUX_INCLUDE_DIR=path_to_avidemux_lib. It is probably /usr/include .")
-#ELSE (NOT AVIDEMUX_INCLUDE_DIR)
-        ## We need AVIDEMUX_INCLUDE_DIR 
-	#SET(AVIDEMUX_INCLUDE_DIR "${AVIDEMUX_INCLUDE_DIR}" CACHE STRING "")
-#ENDIF (NOT AVIDEMUX_INCLUDE_DIR)
+SET(ADM_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_VERSION})
+SET(ADM_CMAKE_DIR  ${ADM_HEADER_DIR}/cmake)
 
+# Common definitions...
+SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${CMAKE_MODULE_PATH}")
+MESSAGE(STATUS  "Checking for avidemux include folder (i.e. CMAKE_INSTALL_PREFIX/include/avidemux/${AVIDEMUX_VERSION}")
+if(NOT EXISTS "${ADM_HEADER_DIR}")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n i cannot find avidemux include folder.cmake .\nSet CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_HEADER_DIR}")
 
+MESSAGE(STATUS "Found avidemux include folder. good.")
+MESSAGE(STATUS "Checking for cmake subfolder")
 
+if(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n I cannot find content of the cmake subfolder .\n")
+        MESSAGE(STATUS  "Set CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(STATUS  "I was looking for admCoreIncludesExternalBuild.cmake in  ${ADM_CMAKE_DIR}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+MESSAGE(STATUS "Found cmake subfolder.good.")
 
-# Common definitions...
-SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-include(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux/commonCmakeApplication.cmake)
-include(${AVIDEMUX_TOP_SOURCE_DIR}/cmake/admAsNeeded.cmake)
+
+include(${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake)
+include(${ADM_CMAKE_DIR}/admConfigHelper.cmake)
 ########################################
 # Add include dirs
 ########################################
@@ -50,9 +53,8 @@
 #########################################
 # Get regular stuff from main app
 #########################################
-include(admCoreIncludes)
-LINK_DIRECTORIES("${AVIDEMUX_LIB_DIR}")
-INCLUDE_DIRECTORIES(${AVIDEMUX_INCLUDE_DIR}/avidemux/2.7/)
+LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
+INCLUDE_DIRECTORIES(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_VERSION}/)
 
 IF (FRESH_BUILD)
 	MESSAGE("")
@@ -62,6 +64,7 @@
 # Global options
 ########################################
 OPTION(VERBOSE "" OFF)
+
 ################################################
 # Now really define our plugin...
 ###############################################

avidemux_2.7.0.tar.gz/myOwnPlugins/demuxer/readme.txt -> avidemux_2.7.1.tar.gz/myOwnPlugins/demuxer/readme.txt Changed

avidemux_2.7.0.tar.gz/myOwnPlugins/muxer/CMakeLists.txt -> avidemux_2.7.1.tar.gz/myOwnPlugins/muxer/CMakeLists.txt Changed

@@ -9,37 +9,53 @@
 
 SET(ADM_PROJECT AdmLibMkvMuxer)
 SET(PLUGINS TRUE)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
+SET(DO_COMMON TRUE)
+SET(AVIDEMUX_VERSION 2.7)                 # important !
+SET(AVIDEMUX_EXTERNAL_BUILD True)         # important !
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
+######################################################
+# Try to locate & setup avidemux development files
+######################################################
 
-ADD_DEFINITIONS("-fPIC -g")
+MESSAGE(STATUS "Checking for avidemux development files ..")
 
-########################################
-# Where is the top dir ?
-########################################
+SET(ADM_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_VERSION})
+SET(ADM_CMAKE_DIR  ${ADM_HEADER_DIR}/cmake)
 
-MESSAGE(STATUS "Checking for AVIDEMUX_SOURCE_DIR, AVIDEMUX_LIB_DIR, AVIDEMUX_INCLUDE_DIR...")
-IF (NOT AVIDEMUX_SOURCE_DIR)
-	MESSAGE(FATAL_ERROR "Please add -DAVIDEMUX_SOURCE_DIR=path_to_avidemux_source. You just need the source tree.")
-ELSE (NOT AVIDEMUX_TOP_SOURCE_DIR)
-        # We need TOP_SOURCE_DIR 
-	SET(AVIDEMUX_TOP_SOURCE_DIR "${AVIDEMUX_SOURCE_DIR}" CACHE STRING "")
-ENDIF (NOT AVIDEMUX_SOURCE_DIR)
 # Common definitions...
-SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-include(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux/commonCmakeApplication.cmake)
-include(${AVIDEMUX_TOP_SOURCE_DIR}/cmake/admAsNeeded.cmake)
+SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${CMAKE_MODULE_PATH}")
+MESSAGE(STATUS  "Checking for avidemux include folder (i.e. CMAKE_INSTALL_PREFIX/include/avidemux/${AVIDEMUX_VERSION}")
+if(NOT EXISTS "${ADM_HEADER_DIR}")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n i cannot find avidemux include folder.cmake .\nSet CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_HEADER_DIR}")
+
+MESSAGE(STATUS "Found avidemux include folder. good.")
+MESSAGE(STATUS "Checking for cmake subfolder")
+
+if(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n I cannot find content of the cmake subfolder .\n")
+        MESSAGE(STATUS  "Set CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(STATUS  "I was looking for admCoreIncludesExternalBuild.cmake in  ${ADM_CMAKE_DIR}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+MESSAGE(STATUS "Found cmake subfolder.good.")
+
+
+include(${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake)
+include(${ADM_CMAKE_DIR}/admConfigHelper.cmake)
 ########################################
 # Add include dirs
 ########################################
 SET(AVIDEMUX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
 MARK_AS_ADVANCED(AVIDEMUX_INSTALL_DIR)
 include(admInstallDir)
+
 #########################################
 # Get regular stuff from main app
 #########################################
-include(admCoreIncludes)
-LINK_DIRECTORIES("${AVIDEMUX_LIB_DIR}")
-INCLUDE_DIRECTORIES(${AVIDEMUX_INCLUDE_DIR}/avidemux/2.7/)
+LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
+INCLUDE_DIRECTORIES(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_VERSION}/)
 
 IF (FRESH_BUILD)
 	MESSAGE("")
@@ -49,21 +65,29 @@
 # Global options
 ########################################
 OPTION(VERBOSE "" OFF)
+
 ################################################
 # Now really define our plugin...
 ###############################################
 
-include(mx_plugin)
-SUBDIRS(libmkv)
+INCLUDE(mx_plugin)
+INCLUDE_DIRECTORIES(libmkv/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+SET(libmkv  libmkv/src/attachments.c libmkv/src/chapters.c
+            libmkv/src/ebml.c        libmkv/src/ebml.h
+            libmkv/src/Makefile.am   libmkv/src/matroska.c
+            libmkv/src/matroska.h    libmkv/src/md5.c
+            libmkv/src/md5.h         libmkv/src/tags.c
+            libmkv/src/tracks.c
+)
 SET(ADM_lmkv_SRCS
 	muxerLmkvPlugin.cpp
 	muxerLmkv.cpp
 	muxerLmkvAudio.cpp
 	muxerLmkvVideo.cpp
 	muxerLmkvConfig.cpp
+    ${libmkv}
 )
 ADD_MUXER(ADM_mx_libmkv SHARED ${ADM_lmkv_SRCS})
-TARGET_LINK_LIBRARIES(ADM_mx_libmkv  ADMlibmkv)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INIT_MUXER(ADM_mx_libmkv)
 INSTALL_MUXER(ADM_mx_libmkv)

avidemux_2.7.0.tar.gz/myOwnPlugins/muxer/libmkv/CMakeLists.txt -> avidemux_2.7.1.tar.gz/myOwnPlugins/muxer/libmkv/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/myOwnPlugins/muxer/readme.txt -> avidemux_2.7.1.tar.gz/myOwnPlugins/muxer/readme.txt Changed

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libVaEncodingContextH264.cpp Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libVaEncodingContextH264.h Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libVaEncodingContextH264_misc.cpp Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libVaEncodingContextH264_packed.cpp Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libVaEncodingContextH264_render.cpp Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libvaEncoder.cpp Added

@@ -0,0 +1,154 @@
+/***************************************************************************
+ \fn ADM_VideoEncoders
+ \brief Internal handling of video encoders
+ -------------------
+ 
+ copyright : (C) 2018 by mean
+ email : fixounet@free.fr
+ ***************************************************************************/
+/* Derived from libva sample code */
+/*
+ * Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+#include "ADM_default.h"
+
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+
+
+#include "ADM_libvaEncoder.h"
+#include "va/va.h"
+#include "va/va_enc_h264.h"
+#include "ADM_coreLibVA_buffer.h"
+#include "vaDefines.h"
+#include "ADM_coreLibVA_encodingContext.h"
+#include "ADM_libVaEncodingContextH264.h"
+
+/**
+ \fn ADM_libvaEncoder
+*/
+ADM_libvaEncoder::ADM_libvaEncoder(ADM_coreVideoFilter *src,bool globalHeader) : ADM_coreVideoEncoder(src)
+{
+ ADM_info("[LibVAEncoder] Creating, globalHeader=%d.\n",globalHeader);
+ image=new ADMImageDefault(getWidth(),getHeight());
+ vaContext=NULL;
+ extraDataSize=0;
+ extraData=NULL;
+ this->globalHeader=globalHeader;
+}
+/**
+ * 
+ * @return 
+ */
+bool ADM_libvaEncoder::setup(void)
+{
+ ADM_info("[LibVAEncoder] Setting up.\n");
+ int w=getWidth(),h=getHeight();
+ std::vector<ADM_vaSurface *>xNone;
+#if 0
+ vaContext= ADM_vaEncodingContext::allocate(0,w,h,getFrameIncrement(),xNone);
+ if(!vaContext) 
+ return false;
+#else
+ // Allocate a new one
+ ADM_vaEncodingContextH264Base *ctx;
+ if(globalHeader)
+ {
+ ctx=new ADM_vaEncodingContextH264Base;
+ }else
+ {
+ ctx=new ADM_vaEncodingContextH264AnnexB;
+ }
+ if(!ctx->setup(w, h, getFrameIncrement(), xNone))
+ {
+ delete ctx;
+ ctx=NULL; 
+ return false;
+ }
+ vaContext=ctx;
+#endif
+ 
+ vaContext->generateExtraData(&(this->extraDataSize),&(this->extraData));
+ return true;
+}
+
+ 
+/** 
+ \fn ~ADM_libvaEncoder
+*/
+ADM_libvaEncoder::~ADM_libvaEncoder()
+{
+ ADM_info("[LibVAEncoder] Destroying.\n");
+ if(vaContext)
+ {
+ delete vaContext;
+ vaContext=NULL;
+ }
+ if(extraData)
+ {
+ delete [] extraData;
+ extraData=NULL;
+ }
+ 
+}
+
+
+/**
+ \fn encode
+*/
+bool ADM_libvaEncoder::encode (ADMBitstream * out)
+{
+ uint32_t fn;
+ aprintf("[LibVAEncoder] Encoding.\n");
+ 
+ if(source->getNextFrame(&fn,image)==false)
+ {
+ ADM_warning("[LIBVA] Cannot get next image\n");
+ return false;
+ }
+ bool r=vaContext->encode(image,out);
+ aprintf("Encoding frame %d, result = %d, size=%d\n",fn,r,out->len);
+ return r;
+}
+
+bool ADM_libvaEncoder::getExtraData(uint32_t *l,uint8_t **d)
+{
+ *l=extraDataSize;
+ *d=extraData;
+ return true;
+}
+
+
+
+// EOF
\ No newline at end of file

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libvaEncoder.h Added

@@ -0,0 +1,50 @@
+/***************************************************************************
+                          \fn ADM_VideoEncoders
+                          \brief Internal handling of video encoders
+                             -------------------
+    
+    copyright            : (C) 2002/2009 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_coreVideoEncoder.h"
+#include "ADM_coreLibVA/ADM_coreLibVA.h"
+#include "ADM_coreLibVA_encodingContext.h"
+
+/**
+        \class ADM_libvaEncoder
+        \brief Dummy encoder that does nothing
+
+*/
+class ADM_libvaEncoder : public ADM_coreVideoEncoder
+{
+protected:
+               ADM_vaEncodingContext     *vaContext;
+public:
+
+                            ADM_libvaEncoder(ADM_coreVideoFilter *src,bool globalHeader);
+                            ~ADM_libvaEncoder();
+virtual        bool         encode (ADMBitstream * out);
+virtual const  char         *getFourcc(void) {return "H264";}
+virtual        bool         setup(void);
+virtual        bool         getExtraData(uint32_t *l,uint8_t **d);
+
+protected:
+                int         extraDataSize;
+                uint8_t     *extraData;
+                bool        globalHeader;
+
+
+
+};
+
+

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/ADM_libvaEncoder_debug.h Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/CMakeLists.txt Added

@@ -0,0 +1,96 @@
+###################################################
+MESSAGE("#####################################")
+MESSAGE("Custom videoEncoder plugin template Started")
+MESSAGE("#####################################")
+MESSAGE("")
+
+SET(ADM_PROJECT vaEnc)
+#
+ADD_DEFINITIONS("-g")
+SET(CMAKE_BUILD_TYPE Debug)
+#
+#
+SET(PLUGINS TRUE)
+SET(DO_COMMON TRUE)
+SET(AVIDEMUX_VERSION 2.7)                 # important !
+SET(AVIDEMUX_EXTERNAL_BUILD True)         # important !
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
+# Needed for Clang, does not hurt others (?)
+#ADD_DEFINITIONS(-std=c++11)
+######################################################
+# Try to locate & setup avidemux development files
+######################################################
+
+MESSAGE(STATUS "Checking for avidemux development files ..")
+
+SET(ADM_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_VERSION})
+SET(ADM_CMAKE_DIR  ${ADM_HEADER_DIR}/cmake)
+
+# Common definitions...
+SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${CMAKE_MODULE_PATH}")
+MESSAGE(STATUS  "Checking for avidemux include folder (i.e. CMAKE_INSTALL_PREFIX/include/avidemux/${AVIDEMUX_VERSION}")
+if(NOT EXISTS "${ADM_HEADER_DIR}")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n i cannot find avidemux include folder.cmake .\nSet CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_HEADER_DIR}")
+
+MESSAGE(STATUS "Found avidemux include folder. good.")
+MESSAGE(STATUS "Checking for cmake subfolder")
+
+if(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n I cannot find content of the cmake subfolder .\n")
+        MESSAGE(STATUS  "Set CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(STATUS  "I was looking for admCoreIncludesExternalBuild.cmake in  ${ADM_CMAKE_DIR}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+MESSAGE(STATUS "Found cmake subfolder.good.")
+
+
+include(${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake)
+include(${ADM_CMAKE_DIR}/admConfigHelper.cmake)
+########################################
+# Add include dirs
+########################################
+SET(AVIDEMUX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+MARK_AS_ADVANCED(AVIDEMUX_INSTALL_DIR)
+include(admInstallDir)
+#########################################
+# Get regular stuff from main app
+#########################################
+LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
+INCLUDE_DIRECTORIES(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_VERSION}/)
+
+IF (FRESH_BUILD)
+    MESSAGE("")
+ENDIF (FRESH_BUILD)
+
+########################################
+# Global options
+########################################
+OPTION(VERBOSE "" OFF)
+################################################
+# Now really define our plugin...
+###############################################
+include(admAsNeeded)
+INCLUDE(ve_plugin)
+
+#
+include(admConfigSummary)
+include(admCheckLibVA)
+checkLibVA()
+include_directories(${ADM_HEADER_DIR}/ADM_coreLibVA)        
+include_directories(${ADM_HEADER_DIR}/ADM_coreLibVAEnc/)
+ADD_VIDEO_ENCODER(ADM_ve_libva  
+                libvaencPlugin.cpp 
+                ADM_libVaEncodingContextH264_misc.cpp
+                ADM_libVaEncodingContextH264_render.cpp
+                ADM_libVaEncodingContextH264_packed.cpp
+                ADM_libvaEncoder.cpp  
+                ADM_libVaEncodingContextH264.cpp
+                    )
+
+TARGET_LINK_LIBRARIES(ADM_ve_libva ADM_coreLibVAEnc6 ADM_coreLibVA6 va)
+INIT_VIDEO_ENCODER(ADM_ve_libva)
+INSTALL_VIDEO_ENCODER(ADM_ve_libva)
+SET(ADM_vf_logo_SRCS ADM_vidLogo.cpp)
+

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/libvaencPlugin.cpp Added

@@ -0,0 +1,79 @@
+/***************************************************************************
+                          \fn     libvaEnc_plugin
+                          \brief  Plugin to use libva hw encoder (intel mostly)
+                             -------------------
+
+    copyright            : (C) 2018 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_libvaEncoder.h"
+#include "ADM_coreVideoEncoderInternal.h"
+#include "DIA_factory.h"
+#include "ADM_coreLibVA_h264Encoding.h"
+
+#include "vaenc_settings.h"
+extern "C"
+{
+#include "vaenc_settings_desc.cpp"
+}
+extern bool     vaEncConfigure(void);
+ static const  vaconf_settings defaultConf = {10*1000,100};
+vaconf_settings vaH264Settings=defaultConf;
+/**
+ * 
+ */
+void resetConfigurationData()
+{  
+    memcpy(&vaH264Settings, &defaultConf, sizeof(vaH264Settings));
+}
+
+/**
+ * 
+ * @return 
+ */
+static bool         ADM_libvaEncoder_probe()
+{
+    VAProfile profile=vaGetH264EncoderProfile()->profile;
+    if(profile==VAProfileNone)
+    {
+        ADM_error("No H264 encoding support\n");
+        return false;
+    }    
+    return true;
+} 
+ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_libvaEncoder);
+ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("LibVaEncoder (HW)",
+                               "Intel AVC HW (VA)",
+                               "Simple Libva Encoder (c) 2018 Mean",
+                                vaEncConfigure, // No configuration
+                                ADM_UI_ALL,
+                                1,0,0,
+                                vaconf_settings_param, // conf template
+                                &vaH264Settings, // conf var
+                                NULL,NULL ,       // setProfile,getProfile)
+                                ADM_libvaEncoder_probe                                  
+);
+/**
+ * 
+ * @return 
+ */
+bool vaEncConfigure(void)
+{
+
+    diaElemUInteger  period(&(vaH264Settings.IntraPeriod),QT_TRANSLATE_NOOP("vaH264","_IDR Period:"),1,1000);
+    diaElemUInteger  bitrate(&(vaH264Settings.BitrateKbps),QT_TRANSLATE_NOOP("vaH264","_Bitrate(kbps)"),1,100*1000);
+
+    diaElem *elems[2]={&bitrate,&period};    
+    return diaFactoryRun(QT_TRANSLATE_NOOP("vaEncH264","vaH264 Configuration"),2 ,elems);
+}
+// EOF
\ No newline at end of file

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/readme.txt Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/vaDefines.h Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/vaenc_settings.conf Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/vaenc_settings.h Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/vaenc_settings_desc.cpp Added

avidemux_2.7.1.tar.gz/myOwnPlugins/videoEncoder/vaenc_settings_json.cpp Added

avidemux_2.7.0.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shader.cpp -> avidemux_2.7.1.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shader.cpp Changed

@@ -2,7 +2,7 @@
 \file shaderLoader
 \brief Rotate picture
 
- 
+
 copyright : (C) 2011 by mean
 
 ***************************************************************************/
@@ -15,6 +15,7 @@
 * (at your option) any later version. *
 * *
 ***************************************************************************/
+#include <string>
 #include "ADM_openGl.h"
 #define ADM_LEGACY_PROGGY
 #include "ADM_default.h"
@@ -24,6 +25,7 @@
 #include "DIA_factory.h"
 #include "shaderLoader.h"
 #include "shaderLoader_desc.cpp"
+#include "DIA_coreToolkit.h"
 /**
 \class shaderLoader
 */
@@ -39,6 +41,9 @@
 
 protected:
 bool render(ADMImage *image,ADM_PLANE plane,QGLFramebufferObject *fbo);
+ bool loadShader(const char *src);
+ bool reload( void);
+ static void cb(void *c);
 public:
 shaderLoader(ADM_coreVideoFilter *previous,CONFcouple *conf);
 ~shaderLoader();
@@ -51,16 +56,65 @@
 };
 
 // Add the hook to make it valid plugin
-DECLARE_VIDEO_FILTER( shaderLoader, // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE( shaderLoader, // Class
 1,0,0, // Version
 ADM_UI_QT4+ADM_FEATURE_OPENGL, // UI
 VF_OPENGL, // Category
 "shaderLoader", // internal name (must be uniq!)
- "Shader Loader", // Display name
- "Run an external shader program." // Description
+ QT_TRANSLATE_NOOP("glShader","Shader Loader"), // Display name
+ QT_TRANSLATE_NOOP("glShader","Run an external shader program.") // Description
 );
 
-// Now implements the interesting parts
+
+/**
+ * \fn loadShader
+ * @param src
+ * @return 
+ */
+bool shaderLoader::loadShader(const char *src)
+{
+ 
+ if(!ADM_fileExist(src))
+ {
+ ADM_warning("Shader file does not exist (%s)\n",src);
+ return false;
+ }
+ 
+ int sourceSize=ADM_fileSize(src);
+ if(sourceSize<5)
+ {
+ ADM_warning("Shader file is too short(%s)\n",src);
+ return false;
+ }
+ 
+ uint8_t *buffer=(uint8_t *)admAlloca(sourceSize+1);
+ FILE *f=fopen(params.shaderFile.c_str(),"rt");
+ if(!f)
+ {
+ ADM_warning("Cannot open file %s\n",src);
+ return false;
+ }
+ 
+ fread(buffer,sourceSize,1,f);
+ buffer[sourceSize]=0;
+ fclose(f);
+ f=NULL;
+
+ if(glProgramY)
+ {
+ delete glProgramY;
+ glProgramY=NULL;
+ }
+ glProgramY = createShaderFromSource(QGLShader::Fragment,(char *)buffer);
+ if(!glProgramY)
+ {
+ ADM_error("Shader compiling failed\n");
+ return false;
+ }
+ ADM_info("Shader %s successfully loaded an compiled\n",src);
+ return true;
+}
+
 /**
 \fn shaderLoader
 \brief constructor
@@ -74,32 +128,17 @@
 original=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
 _parentQGL->makeCurrent();
 fboY->bind();
- ready=true;
- 
- printf("Compiling shader \n");
- glProgramY = new QGLShaderProgram(_context);
- ADM_assert(glProgramY);
- if ( !glProgramY->addShaderFromSourceFile(QGLShader::Fragment, params.shaderFile))
- {
- ready=false;
- erString="Compiling shader failed"+std::string(glProgramY->log().toUtf8().constData());
- }
- if ( ready && !glProgramY->link())
- {
- ready=false;
- erString=std::string( glProgramY->log().toUtf8().constData());
- }
+ ready=false;
 
- if ( ready && ! glProgramY->bind())
- {
- ready=false;
- erString=std::string("OpenGl bind failed");
- }
+ ADM_info("Compiling shader %s \n",params.shaderFile.c_str());
+
+ // Load the file info memory
+ ready=loadShader(params.shaderFile.c_str());
+ 
 glList=glGenLists(1);
 genQuad();
 fboY->release();
 _parentQGL->doneCurrent();
-
 }
 /**
 \fn shaderLoader
@@ -129,6 +168,7 @@
 {
 ADM_info("OpenGl shader not loaded (%s)\n",erString.c_str());
 image->duplicateFull(original);
+ image->printString(2,2,"Shader not loaded");
 image->printString(2,2,erString.c_str());
 return true;
 }
@@ -137,10 +177,12 @@
 // size is the last one...
 fboY->bind();
 
- glProgramY->setUniformValue("myTextureU", 1); 
- glProgramY->setUniformValue("myTextureV", 2); 
- glProgramY->setUniformValue("myTextureY", 0); 
- glProgramY->setUniformValue("pts", (GLfloat)original->Pts); 
+ glProgramY->setUniformValue("myTextureU", 1);
+ glProgramY->setUniformValue("myTextureV", 2);
+ glProgramY->setUniformValue("myTextureY", 0);
+ glProgramY->setUniformValue("myResolution", (GLfloat)info.width,(GLfloat)info.height);
+
+ glProgramY->setUniformValue("pts", (GLfloat)original->Pts);
 
 uploadAllPlanes(original);
 
@@ -175,39 +217,69 @@
 const char *shaderLoader::getConfiguration(void)
 {
 static char st[200];
- snprintf(st,199,"Shader Loader %s",params.shaderFile);
+ snprintf(st,199,"Shader Loader %s",params.shaderFile.c_str());
 return st;
 }
 
+void shaderLoader::cb(void *c)
+{
+ shaderLoader *sl=(shaderLoader *)c;
+ sl->ready=sl->reload();
+}
+/**
+ * 
+ * @return 
+ */
+bool shaderLoader::reload( void)
+{
+ _parentQGL->makeCurrent();
+ fboY->bind();
+ ADM_info("Compiling shader %s \n",params.shaderFile.c_str());
+ // Load the file info memory
+ ready=loadShader(params.shaderFile.c_str()); 
+ glList=glGenLists(1);
+ genQuad();
+ fboY->release();
+ _parentQGL->doneCurrent();
+ if(!ready)
+ {
+ GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Cannot compile shader"), NULL);
+ return false;
+ }
+ return true;
+}
 /**
 \fn configure
 */
-bool shaderLoader::configure( void) 
+bool shaderLoader::configure( void)
 {
- char *name=strdup(params.shaderFile);
- diaElemFile shader(0,&name,"ShaderFile to load");
- 
- diaElem *elems[]={&shader};
- 
- if(diaFactoryRun(QT_TR_NOOP("ShaderLoader"),sizeof(elems)/sizeof(diaElem *),elems))
+again:
+ diaElemFile shader(0,params.shaderFile,QT_TRANSLATE_NOOP("glShader","ShaderFile to load")); 
+ diaElemButton reloadButton(QT_TR_NOOP("Reload shader"),cb,this);
+ diaElem *elems[]={&shader,&reloadButton};
+ 
+ if(diaFactoryRun(QT_TRANSLATE_NOOP("glShader","ShaderLoader"),sizeof(elems)/sizeof(diaElem *),elems))
 {
- params.shaderFile=strdup(name); // memleak
- return true;
+ ready=reload();
+ if(!ready)
+ {
+ goto again;
+ }
+ return true; 
 }
- free(name); 
 return false;
 }
 /**
- * 
- * @return 
+ *
+ * @return
 */
 bool shaderLoader::genQuad(void)
 {
 int width=info.width;
 int height=info.height;
 
-#define POINT(a,b) glTexCoord2i(a, b);glVertex2i(a, b); 
- 
+#define POINT(a,b) glTexCoord2i(a, b);glVertex2i(a, b);
+
 glDeleteLists(glList,1);
 glNewList(glList,GL_COMPILE);
 glBegin(GL_QUADS);

avidemux_2.7.0.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader.h -> avidemux_2.7.1.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader.h Changed

avidemux_2.7.0.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader_desc.cpp -> avidemux_2.7.1.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader_desc.cpp Changed

Build Results
RPM Lint

Refresh

Comments for request 4248 0

Request History

enzokiel created request over 6 years ago

Update to version 2.7.1

enzokiel accepted request over 6 years ago